cefclient: Don't specify `virtual` in combination with `OVERRIDE` since it's redundant (issue #1500).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1986 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2015-01-22 23:34:29 +00:00
parent b9dd027411
commit 7a0b40e8c9
6 changed files with 258 additions and 268 deletions

View File

@ -12,13 +12,13 @@
class BytesWriteHandler : public CefWriteHandler { class BytesWriteHandler : public CefWriteHandler {
public: public:
explicit BytesWriteHandler(size_t grow); explicit BytesWriteHandler(size_t grow);
virtual ~BytesWriteHandler(); ~BytesWriteHandler();
virtual size_t Write(const void* ptr, size_t size, size_t n) OVERRIDE; size_t Write(const void* ptr, size_t size, size_t n) OVERRIDE;
virtual int Seek(int64 offset, int whence) OVERRIDE; int Seek(int64 offset, int whence) OVERRIDE;
virtual int64 Tell() OVERRIDE; int64 Tell() OVERRIDE;
virtual int Flush() OVERRIDE; int Flush() OVERRIDE;
virtual bool MayBlock() OVERRIDE { return false; } bool MayBlock() OVERRIDE { return false; }
void* GetData() { return data_; } void* GetData() { return data_; }
int64 GetDataSize() { return offset_; } int64 GetDataSize() { return offset_; }

View File

@ -40,30 +40,30 @@ class OSRWindow : public ClientHandler::RenderHandler {
} }
// ClientHandler::RenderHandler methods // ClientHandler::RenderHandler methods
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE; void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
// CefRenderHandler methods // CefRenderHandler methods
virtual bool GetViewRect(CefRefPtr<CefBrowser> browser, bool GetViewRect(CefRefPtr<CefBrowser> browser,
CefRect& rect) OVERRIDE; CefRect& rect) OVERRIDE;
virtual bool GetScreenPoint(CefRefPtr<CefBrowser> browser, bool GetScreenPoint(CefRefPtr<CefBrowser> browser,
int viewX, int viewX,
int viewY, int viewY,
int& screenX, int& screenX,
int& screenY) OVERRIDE; int& screenY) OVERRIDE;
virtual void OnPopupShow(CefRefPtr<CefBrowser> browser, void OnPopupShow(CefRefPtr<CefBrowser> browser,
bool show) OVERRIDE; bool show) OVERRIDE;
virtual void OnPopupSize(CefRefPtr<CefBrowser> browser, void OnPopupSize(CefRefPtr<CefBrowser> browser,
const CefRect& rect) OVERRIDE; const CefRect& rect) OVERRIDE;
virtual void OnPaint(CefRefPtr<CefBrowser> browser, void OnPaint(CefRefPtr<CefBrowser> browser,
PaintElementType type, PaintElementType type,
const RectList& dirtyRects, const RectList& dirtyRects,
const void* buffer, const void* buffer,
int width, int width,
int height) OVERRIDE; int height) OVERRIDE;
virtual void OnCursorChange(CefRefPtr<CefBrowser> browser, void OnCursorChange(CefRefPtr<CefBrowser> browser,
CefCursorHandle cursor, CefCursorHandle cursor,
CursorType type, CursorType type,
const CefCursorInfo& custom_cursor_info) OVERRIDE; const CefCursorInfo& custom_cursor_info) OVERRIDE;
void Invalidate(); void Invalidate();
bool IsOverPopupWidget(int x, int y) const; bool IsOverPopupWidget(int x, int y) const;
@ -76,7 +76,7 @@ class OSRWindow : public ClientHandler::RenderHandler {
bool transparent, bool transparent,
bool show_update_rect, bool show_update_rect,
ClientWindowHandle parentView); ClientWindowHandle parentView);
virtual ~OSRWindow(); ~OSRWindow();
void Render(); void Render();
void EnableGL(); void EnableGL();

View File

@ -60,51 +60,43 @@ class ClientOSRHandler : public ClientHandler::RenderHandler {
public: public:
explicit ClientOSRHandler(ClientOpenGLView* view, explicit ClientOSRHandler(ClientOpenGLView* view,
OSRBrowserProvider* browser_provider); OSRBrowserProvider* browser_provider);
virtual ~ClientOSRHandler(); ~ClientOSRHandler();
void Disconnect(); void Disconnect();
// ClientHandler::RenderHandler // ClientHandler::RenderHandler
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE; void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
// CefRenderHandler methods // CefRenderHandler methods
bool GetViewRect(CefRefPtr<CefBrowser> browser,
virtual bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) OVERRIDE;
CefRect& rect) OVERRIDE; bool GetScreenPoint(CefRefPtr<CefBrowser> browser,
int viewX,
virtual bool GetScreenPoint(CefRefPtr<CefBrowser> browser, int viewY,
int viewX, int& screenX,
int viewY, int& screenY) OVERRIDE;
int& screenX, bool GetScreenInfo(CefRefPtr<CefBrowser> browser,
int& screenY) OVERRIDE; CefScreenInfo& screen_info) OVERRIDE;
virtual bool GetScreenInfo(CefRefPtr<CefBrowser> browser, void OnPopupShow(CefRefPtr<CefBrowser> browser,
CefScreenInfo& screen_info) OVERRIDE; bool show) OVERRIDE;
void OnPopupSize(CefRefPtr<CefBrowser> browser,
virtual void OnPopupShow(CefRefPtr<CefBrowser> browser, const CefRect& rect) OVERRIDE;
bool show) OVERRIDE; void OnPaint(CefRefPtr<CefBrowser> browser,
PaintElementType type,
virtual void OnPopupSize(CefRefPtr<CefBrowser> browser, const RectList& dirtyRects,
const CefRect& rect) OVERRIDE; const void* buffer,
int width, int height) OVERRIDE;
virtual void OnPaint(CefRefPtr<CefBrowser> browser, void OnCursorChange(CefRefPtr<CefBrowser> browser,
PaintElementType type, CefCursorHandle cursor,
const RectList& dirtyRects, CursorType type,
const void* buffer, const CefCursorInfo& custom_cursor_info) OVERRIDE;
int width, int height) OVERRIDE; bool StartDragging(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefDragData> drag_data,
virtual void OnCursorChange(CefRefPtr<CefBrowser> browser, CefRenderHandler::DragOperationsMask allowed_ops,
CefCursorHandle cursor, int x, int y) OVERRIDE;
CursorType type, void UpdateDragCursor(
const CefCursorInfo& custom_cursor_info) OVERRIDE;
virtual bool StartDragging(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefDragData> drag_data,
CefRenderHandler::DragOperationsMask allowed_ops,
int x, int y) OVERRIDE;
virtual void UpdateDragCursor(
CefRefPtr<CefBrowser> browser, CefRefPtr<CefBrowser> browser,
CefRenderHandler::DragOperation operation)OVERRIDE; CefRenderHandler::DragOperation operation) OVERRIDE;
CefWindowHandle view() { return view_; } CefWindowHandle view() { return view_; }
@ -139,7 +131,6 @@ class OSRWindow {
bool show_update_rect, bool show_update_rect,
CefWindowHandle parentView, CefWindowHandle parentView,
const CefRect& frame); const CefRect& frame);
~OSRWindow(); ~OSRWindow();
CefRefPtr<ClientOSRHandler> render_client; CefRefPtr<ClientOSRHandler> render_client;

View File

@ -46,51 +46,50 @@ class OSRWindow : public ClientHandler::RenderHandler
} }
// ClientHandler::RenderHandler methods // ClientHandler::RenderHandler methods
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE; void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
// CefRenderHandler methods // CefRenderHandler methods
virtual bool GetRootScreenRect(CefRefPtr<CefBrowser> browser, bool GetRootScreenRect(CefRefPtr<CefBrowser> browser,
CefRect& rect) OVERRIDE; CefRect& rect) OVERRIDE;
virtual bool GetViewRect(CefRefPtr<CefBrowser> browser, bool GetViewRect(CefRefPtr<CefBrowser> browser,
CefRect& rect) OVERRIDE; CefRect& rect) OVERRIDE;
virtual bool GetScreenPoint(CefRefPtr<CefBrowser> browser, bool GetScreenPoint(CefRefPtr<CefBrowser> browser,
int viewX, int viewX,
int viewY, int viewY,
int& screenX, int& screenX,
int& screenY) OVERRIDE; int& screenY) OVERRIDE;
virtual void OnPopupShow(CefRefPtr<CefBrowser> browser, void OnPopupShow(CefRefPtr<CefBrowser> browser,
bool show) OVERRIDE; bool show) OVERRIDE;
virtual void OnPopupSize(CefRefPtr<CefBrowser> browser, void OnPopupSize(CefRefPtr<CefBrowser> browser,
const CefRect& rect) OVERRIDE; const CefRect& rect) OVERRIDE;
virtual void OnPaint(CefRefPtr<CefBrowser> browser, void OnPaint(CefRefPtr<CefBrowser> browser,
PaintElementType type, PaintElementType type,
const RectList& dirtyRects, const RectList& dirtyRects,
const void* buffer, const void* buffer,
int width, int width,
int height) OVERRIDE; int height) OVERRIDE;
virtual void OnCursorChange(CefRefPtr<CefBrowser> browser, void OnCursorChange(CefRefPtr<CefBrowser> browser,
CefCursorHandle cursor, CefCursorHandle cursor,
CursorType type, CursorType type,
const CefCursorInfo& custom_cursor_info) OVERRIDE; const CefCursorInfo& custom_cursor_info) OVERRIDE;
virtual bool StartDragging(CefRefPtr<CefBrowser> browser, bool StartDragging(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefDragData> drag_data, CefRefPtr<CefDragData> drag_data,
CefRenderHandler::DragOperationsMask allowed_ops, CefRenderHandler::DragOperationsMask allowed_ops,
int x, int y) OVERRIDE; int x, int y) OVERRIDE;
void UpdateDragCursor(
virtual void UpdateDragCursor(
CefRefPtr<CefBrowser> browser, CefRefPtr<CefBrowser> browser,
CefRenderHandler::DragOperation operation) OVERRIDE; CefRenderHandler::DragOperation operation) OVERRIDE;
#if defined(CEF_USE_ATL) #if defined(CEF_USE_ATL)
// DragEvents methods // DragEvents methods
virtual CefBrowserHost::DragOperationsMask OnDragEnter( CefBrowserHost::DragOperationsMask OnDragEnter(
CefRefPtr<CefDragData> drag_data, CefRefPtr<CefDragData> drag_data,
CefMouseEvent ev, CefMouseEvent ev,
CefBrowserHost::DragOperationsMask effect) OVERRIDE; CefBrowserHost::DragOperationsMask effect) OVERRIDE;
virtual CefBrowserHost::DragOperationsMask OnDragOver(CefMouseEvent ev, CefBrowserHost::DragOperationsMask OnDragOver(CefMouseEvent ev,
CefBrowserHost::DragOperationsMask effect) OVERRIDE; CefBrowserHost::DragOperationsMask effect) OVERRIDE;
virtual void OnDragLeave() OVERRIDE; void OnDragLeave() OVERRIDE;
virtual CefBrowserHost::DragOperationsMask OnDrop(CefMouseEvent ev, CefBrowserHost::DragOperationsMask OnDrop(CefMouseEvent ev,
CefBrowserHost::DragOperationsMask effect) OVERRIDE; CefBrowserHost::DragOperationsMask effect) OVERRIDE;
#endif // defined(CEF_USE_ATL) #endif // defined(CEF_USE_ATL)
@ -104,7 +103,7 @@ class OSRWindow : public ClientHandler::RenderHandler
OSRWindow(OSRBrowserProvider* browser_provider, OSRWindow(OSRBrowserProvider* browser_provider,
bool transparent, bool transparent,
bool show_update_rect); bool show_update_rect);
virtual ~OSRWindow(); ~OSRWindow();
void Render(); void Render();
void EnableGL(); void EnableGL();

View File

@ -120,51 +120,51 @@ class ClientApp : public CefApp,
static CefRefPtr<CefPrintHandler> CreatePrintHandler(); static CefRefPtr<CefPrintHandler> CreatePrintHandler();
// CefApp methods. // CefApp methods.
virtual void OnRegisterCustomSchemes( void OnRegisterCustomSchemes(
CefRefPtr<CefSchemeRegistrar> registrar) OVERRIDE; CefRefPtr<CefSchemeRegistrar> registrar) OVERRIDE;
virtual CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler() CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler() OVERRIDE {
OVERRIDE { return this; } return this;
virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() }
OVERRIDE { return this; } CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() OVERRIDE {
return this;
}
// CefBrowserProcessHandler methods. // CefBrowserProcessHandler methods.
virtual void OnContextInitialized() OVERRIDE; void OnContextInitialized() OVERRIDE;
virtual void OnBeforeChildProcessLaunch( void OnBeforeChildProcessLaunch(
CefRefPtr<CefCommandLine> command_line) OVERRIDE; CefRefPtr<CefCommandLine> command_line) OVERRIDE;
virtual void OnRenderProcessThreadCreated(CefRefPtr<CefListValue> extra_info) void OnRenderProcessThreadCreated(
OVERRIDE; CefRefPtr<CefListValue> extra_info) OVERRIDE;
virtual CefRefPtr<CefPrintHandler> GetPrintHandler() OVERRIDE { CefRefPtr<CefPrintHandler> GetPrintHandler() OVERRIDE {
return print_handler_; return print_handler_;
} }
// CefRenderProcessHandler methods. // CefRenderProcessHandler methods.
virtual void OnRenderThreadCreated(CefRefPtr<CefListValue> extra_info) void OnRenderThreadCreated(CefRefPtr<CefListValue> extra_info) OVERRIDE;
OVERRIDE; void OnWebKitInitialized() OVERRIDE;
virtual void OnWebKitInitialized() OVERRIDE; void OnBrowserCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual void OnBrowserCreated(CefRefPtr<CefBrowser> browser) OVERRIDE; void OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual void OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) OVERRIDE; CefRefPtr<CefLoadHandler> GetLoadHandler() OVERRIDE;
virtual CefRefPtr<CefLoadHandler> GetLoadHandler() OVERRIDE; bool OnBeforeNavigation(CefRefPtr<CefBrowser> browser,
virtual bool OnBeforeNavigation(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request,
CefRefPtr<CefRequest> request, NavigationType navigation_type,
NavigationType navigation_type, bool is_redirect) OVERRIDE;
bool is_redirect) OVERRIDE; void OnContextCreated(CefRefPtr<CefBrowser> browser,
virtual void OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) OVERRIDE;
CefRefPtr<CefV8Context> context) OVERRIDE; void OnContextReleased(CefRefPtr<CefBrowser> browser,
virtual void OnContextReleased(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) OVERRIDE;
CefRefPtr<CefV8Context> context) OVERRIDE; void OnUncaughtException(CefRefPtr<CefBrowser> browser,
virtual void OnUncaughtException(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context,
CefRefPtr<CefV8Context> context, CefRefPtr<CefV8Exception> exception,
CefRefPtr<CefV8Exception> exception, CefRefPtr<CefV8StackTrace> stackTrace) OVERRIDE;
CefRefPtr<CefV8StackTrace> stackTrace) void OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser,
OVERRIDE; CefRefPtr<CefFrame> frame,
virtual void OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDOMNode> node) OVERRIDE;
CefRefPtr<CefFrame> frame, bool OnProcessMessageReceived(
CefRefPtr<CefDOMNode> node) OVERRIDE;
virtual bool OnProcessMessageReceived(
CefRefPtr<CefBrowser> browser, CefRefPtr<CefBrowser> browser,
CefProcessId source_process, CefProcessId source_process,
CefRefPtr<CefProcessMessage> message) OVERRIDE; CefRefPtr<CefProcessMessage> message) OVERRIDE;

View File

@ -52,202 +52,202 @@ class ClientHandler : public CefClient,
typedef std::set<CefMessageRouterBrowserSide::Handler*> MessageHandlerSet; typedef std::set<CefMessageRouterBrowserSide::Handler*> MessageHandlerSet;
ClientHandler(); ClientHandler();
virtual ~ClientHandler(); ~ClientHandler();
// CefClient methods // CefClient methods
virtual CefRefPtr<CefContextMenuHandler> GetContextMenuHandler() OVERRIDE { CefRefPtr<CefContextMenuHandler> GetContextMenuHandler() OVERRIDE {
return this; return this;
} }
virtual CefRefPtr<CefDialogHandler> GetDialogHandler() OVERRIDE { CefRefPtr<CefDialogHandler> GetDialogHandler() OVERRIDE {
return this; return this;
} }
virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() OVERRIDE { CefRefPtr<CefDisplayHandler> GetDisplayHandler() OVERRIDE {
return this; return this;
} }
virtual CefRefPtr<CefDownloadHandler> GetDownloadHandler() OVERRIDE { CefRefPtr<CefDownloadHandler> GetDownloadHandler() OVERRIDE {
return this; return this;
} }
virtual CefRefPtr<CefDragHandler> GetDragHandler() OVERRIDE { CefRefPtr<CefDragHandler> GetDragHandler() OVERRIDE {
return this; return this;
} }
virtual CefRefPtr<CefGeolocationHandler> GetGeolocationHandler() OVERRIDE { CefRefPtr<CefGeolocationHandler> GetGeolocationHandler() OVERRIDE {
return this; return this;
} }
virtual CefRefPtr<CefJSDialogHandler> GetJSDialogHandler() OVERRIDE { CefRefPtr<CefJSDialogHandler> GetJSDialogHandler() OVERRIDE {
return this; return this;
} }
virtual CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() OVERRIDE { CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() OVERRIDE {
return this; return this;
} }
virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() OVERRIDE { CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() OVERRIDE {
return this; return this;
} }
virtual CefRefPtr<CefLoadHandler> GetLoadHandler() OVERRIDE { CefRefPtr<CefLoadHandler> GetLoadHandler() OVERRIDE {
return this; return this;
} }
virtual CefRefPtr<CefRenderHandler> GetRenderHandler() OVERRIDE { CefRefPtr<CefRenderHandler> GetRenderHandler() OVERRIDE {
return this; return this;
} }
virtual CefRefPtr<CefRequestHandler> GetRequestHandler() OVERRIDE { CefRefPtr<CefRequestHandler> GetRequestHandler() OVERRIDE {
return this; return this;
} }
virtual bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser, bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
CefProcessId source_process, CefProcessId source_process,
CefRefPtr<CefProcessMessage> message) CefRefPtr<CefProcessMessage> message)
OVERRIDE; OVERRIDE;
// CefContextMenuHandler methods // CefContextMenuHandler methods
virtual void OnBeforeContextMenu(CefRefPtr<CefBrowser> browser, void OnBeforeContextMenu(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefFrame> frame,
CefRefPtr<CefContextMenuParams> params, CefRefPtr<CefContextMenuParams> params,
CefRefPtr<CefMenuModel> model) OVERRIDE; CefRefPtr<CefMenuModel> model) OVERRIDE;
virtual bool OnContextMenuCommand(CefRefPtr<CefBrowser> browser, bool OnContextMenuCommand(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefFrame> frame,
CefRefPtr<CefContextMenuParams> params, CefRefPtr<CefContextMenuParams> params,
int command_id, int command_id,
EventFlags event_flags) OVERRIDE; EventFlags event_flags) OVERRIDE;
// CefDialogHandler methods // CefDialogHandler methods
virtual bool OnFileDialog(CefRefPtr<CefBrowser> browser, bool OnFileDialog(CefRefPtr<CefBrowser> browser,
FileDialogMode mode, FileDialogMode mode,
const CefString& title, const CefString& title,
const CefString& default_file_path, const CefString& default_file_path,
const std::vector<CefString>& accept_filters, const std::vector<CefString>& accept_filters,
int selected_accept_filter, int selected_accept_filter,
CefRefPtr<CefFileDialogCallback> callback) OVERRIDE; CefRefPtr<CefFileDialogCallback> callback) OVERRIDE;
// CefDisplayHandler methods // CefDisplayHandler methods
virtual void OnAddressChange(CefRefPtr<CefBrowser> browser, void OnAddressChange(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefFrame> frame,
const CefString& url) OVERRIDE; const CefString& url) OVERRIDE;
virtual void OnTitleChange(CefRefPtr<CefBrowser> browser, void OnTitleChange(CefRefPtr<CefBrowser> browser,
const CefString& title) OVERRIDE; const CefString& title) OVERRIDE;
virtual bool OnConsoleMessage(CefRefPtr<CefBrowser> browser, bool OnConsoleMessage(CefRefPtr<CefBrowser> browser,
const CefString& message, const CefString& message,
const CefString& source, const CefString& source,
int line) OVERRIDE; int line) OVERRIDE;
// CefDownloadHandler methods // CefDownloadHandler methods
virtual void OnBeforeDownload( void OnBeforeDownload(
CefRefPtr<CefBrowser> browser, CefRefPtr<CefBrowser> browser,
CefRefPtr<CefDownloadItem> download_item, CefRefPtr<CefDownloadItem> download_item,
const CefString& suggested_name, const CefString& suggested_name,
CefRefPtr<CefBeforeDownloadCallback> callback) OVERRIDE; CefRefPtr<CefBeforeDownloadCallback> callback) OVERRIDE;
virtual void OnDownloadUpdated( void OnDownloadUpdated(
CefRefPtr<CefBrowser> browser, CefRefPtr<CefBrowser> browser,
CefRefPtr<CefDownloadItem> download_item, CefRefPtr<CefDownloadItem> download_item,
CefRefPtr<CefDownloadItemCallback> callback) OVERRIDE; CefRefPtr<CefDownloadItemCallback> callback) OVERRIDE;
// CefDragHandler methods // CefDragHandler methods
virtual bool OnDragEnter(CefRefPtr<CefBrowser> browser, bool OnDragEnter(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefDragData> dragData, CefRefPtr<CefDragData> dragData,
CefDragHandler::DragOperationsMask mask) OVERRIDE; CefDragHandler::DragOperationsMask mask) OVERRIDE;
// CefGeolocationHandler methods // CefGeolocationHandler methods
virtual bool OnRequestGeolocationPermission( bool OnRequestGeolocationPermission(
CefRefPtr<CefBrowser> browser, CefRefPtr<CefBrowser> browser,
const CefString& requesting_url, const CefString& requesting_url,
int request_id, int request_id,
CefRefPtr<CefGeolocationCallback> callback) OVERRIDE; CefRefPtr<CefGeolocationCallback> callback) OVERRIDE;
// CefJSDialogHandler methods // CefJSDialogHandler methods
virtual bool OnJSDialog(CefRefPtr<CefBrowser> browser, bool OnJSDialog(CefRefPtr<CefBrowser> browser,
const CefString& origin_url, const CefString& origin_url,
const CefString& accept_lang, const CefString& accept_lang,
JSDialogType dialog_type, JSDialogType dialog_type,
const CefString& message_text, const CefString& message_text,
const CefString& default_prompt_text, const CefString& default_prompt_text,
CefRefPtr<CefJSDialogCallback> callback, CefRefPtr<CefJSDialogCallback> callback,
bool& suppress_message) OVERRIDE; bool& suppress_message) OVERRIDE;
virtual bool OnBeforeUnloadDialog( bool OnBeforeUnloadDialog(
CefRefPtr<CefBrowser> browser, CefRefPtr<CefBrowser> browser,
const CefString& message_text, const CefString& message_text,
bool is_reload, bool is_reload,
CefRefPtr<CefJSDialogCallback> callback) OVERRIDE; CefRefPtr<CefJSDialogCallback> callback) OVERRIDE;
virtual void OnResetDialogState(CefRefPtr<CefBrowser> browser) OVERRIDE; void OnResetDialogState(CefRefPtr<CefBrowser> browser) OVERRIDE;
// CefKeyboardHandler methods // CefKeyboardHandler methods
virtual bool OnPreKeyEvent(CefRefPtr<CefBrowser> browser, bool OnPreKeyEvent(CefRefPtr<CefBrowser> browser,
const CefKeyEvent& event, const CefKeyEvent& event,
CefEventHandle os_event, CefEventHandle os_event,
bool* is_keyboard_shortcut) OVERRIDE; bool* is_keyboard_shortcut) OVERRIDE;
// CefLifeSpanHandler methods // CefLifeSpanHandler methods
virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser, bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefFrame> frame,
const CefString& target_url, const CefString& target_url,
const CefString& target_frame_name, const CefString& target_frame_name,
const CefPopupFeatures& popupFeatures, const CefPopupFeatures& popupFeatures,
CefWindowInfo& windowInfo, CefWindowInfo& windowInfo,
CefRefPtr<CefClient>& client, CefRefPtr<CefClient>& client,
CefBrowserSettings& settings, CefBrowserSettings& settings,
bool* no_javascript_access) OVERRIDE; bool* no_javascript_access) OVERRIDE;
virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) OVERRIDE; void OnAfterCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual bool DoClose(CefRefPtr<CefBrowser> browser) OVERRIDE; bool DoClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE; void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
// CefLoadHandler methods // CefLoadHandler methods
virtual void OnLoadingStateChange(CefRefPtr<CefBrowser> browser, void OnLoadingStateChange(CefRefPtr<CefBrowser> browser,
bool isLoading, bool isLoading,
bool canGoBack, bool canGoBack,
bool canGoForward) OVERRIDE; bool canGoForward) OVERRIDE;
virtual void OnLoadError(CefRefPtr<CefBrowser> browser, void OnLoadError(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefFrame> frame,
ErrorCode errorCode, ErrorCode errorCode,
const CefString& errorText, const CefString& errorText,
const CefString& failedUrl) OVERRIDE; const CefString& failedUrl) OVERRIDE;
// CefRequestHandler methods // CefRequestHandler methods
virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser, bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefFrame> frame,
CefRefPtr<CefRequest> request, CefRefPtr<CefRequest> request,
bool is_redirect) OVERRIDE; bool is_redirect) OVERRIDE;
virtual CefRefPtr<CefResourceHandler> GetResourceHandler( CefRefPtr<CefResourceHandler> GetResourceHandler(
CefRefPtr<CefBrowser> browser, CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefFrame> frame,
CefRefPtr<CefRequest> request) OVERRIDE; CefRefPtr<CefRequest> request) OVERRIDE;
virtual bool OnQuotaRequest(CefRefPtr<CefBrowser> browser, bool OnQuotaRequest(CefRefPtr<CefBrowser> browser,
const CefString& origin_url, const CefString& origin_url,
int64 new_size, int64 new_size,
CefRefPtr<CefQuotaCallback> callback) OVERRIDE; CefRefPtr<CefQuotaCallback> callback) OVERRIDE;
virtual void OnProtocolExecution(CefRefPtr<CefBrowser> browser, void OnProtocolExecution(CefRefPtr<CefBrowser> browser,
const CefString& url, const CefString& url,
bool& allow_os_execution) OVERRIDE; bool& allow_os_execution) OVERRIDE;
virtual void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser, void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser,
TerminationStatus status) OVERRIDE; TerminationStatus status) OVERRIDE;
// CefRenderHandler methods // CefRenderHandler methods
virtual bool GetRootScreenRect(CefRefPtr<CefBrowser> browser, bool GetRootScreenRect(CefRefPtr<CefBrowser> browser,
CefRect& rect) OVERRIDE; CefRect& rect) OVERRIDE;
virtual bool GetViewRect(CefRefPtr<CefBrowser> browser, bool GetViewRect(CefRefPtr<CefBrowser> browser,
CefRect& rect) OVERRIDE; CefRect& rect) OVERRIDE;
virtual bool GetScreenPoint(CefRefPtr<CefBrowser> browser, bool GetScreenPoint(CefRefPtr<CefBrowser> browser,
int viewX, int viewX,
int viewY, int viewY,
int& screenX, int& screenX,
int& screenY) OVERRIDE; int& screenY) OVERRIDE;
virtual bool GetScreenInfo(CefRefPtr<CefBrowser> browser, bool GetScreenInfo(CefRefPtr<CefBrowser> browser,
CefScreenInfo& screen_info) OVERRIDE; CefScreenInfo& screen_info) OVERRIDE;
virtual void OnPopupShow(CefRefPtr<CefBrowser> browser, bool show) OVERRIDE; void OnPopupShow(CefRefPtr<CefBrowser> browser, bool show) OVERRIDE;
virtual void OnPopupSize(CefRefPtr<CefBrowser> browser, void OnPopupSize(CefRefPtr<CefBrowser> browser,
const CefRect& rect) OVERRIDE; const CefRect& rect) OVERRIDE;
virtual void OnPaint(CefRefPtr<CefBrowser> browser, void OnPaint(CefRefPtr<CefBrowser> browser,
PaintElementType type, PaintElementType type,
const RectList& dirtyRects, const RectList& dirtyRects,
const void* buffer, const void* buffer,
int width, int width,
int height) OVERRIDE; int height) OVERRIDE;
virtual void OnCursorChange(CefRefPtr<CefBrowser> browser, void OnCursorChange(CefRefPtr<CefBrowser> browser,
CefCursorHandle cursor, CefCursorHandle cursor,
CursorType type, CursorType type,
const CefCursorInfo& custom_cursor_info) OVERRIDE; const CefCursorInfo& custom_cursor_info) OVERRIDE;
virtual bool StartDragging(CefRefPtr<CefBrowser> browser, bool StartDragging(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefDragData> drag_data, CefRefPtr<CefDragData> drag_data,
CefRenderHandler::DragOperationsMask allowed_ops, CefRenderHandler::DragOperationsMask allowed_ops,
int x, int y) OVERRIDE; int x, int y) OVERRIDE;
virtual void UpdateDragCursor(CefRefPtr<CefBrowser> browser, void UpdateDragCursor(CefRefPtr<CefBrowser> browser,
CefRenderHandler::DragOperation operation) CefRenderHandler::DragOperation operation)
OVERRIDE; OVERRIDE;
void SetMainWindowHandle(ClientWindowHandle handle); void SetMainWindowHandle(ClientWindowHandle handle);
ClientWindowHandle GetMainWindowHandle() const; ClientWindowHandle GetMainWindowHandle() const;