From 7a0b40e8c9c40b2a5712a22fa6929c31f99f88fa Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 22 Jan 2015 23:34:29 +0000 Subject: [PATCH] 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 --- tests/cefclient/bytes_write_handler.h | 12 +- tests/cefclient/cefclient_osr_widget_gtk.h | 46 ++-- tests/cefclient/cefclient_osr_widget_mac.h | 69 +++--- tests/cefclient/cefclient_osr_widget_win.h | 69 +++--- tests/cefclient/client_app.h | 74 +++--- tests/cefclient/client_handler.h | 256 ++++++++++----------- 6 files changed, 258 insertions(+), 268 deletions(-) diff --git a/tests/cefclient/bytes_write_handler.h b/tests/cefclient/bytes_write_handler.h index 24da860ba..9077cf33f 100644 --- a/tests/cefclient/bytes_write_handler.h +++ b/tests/cefclient/bytes_write_handler.h @@ -12,13 +12,13 @@ class BytesWriteHandler : public CefWriteHandler { public: explicit BytesWriteHandler(size_t grow); - virtual ~BytesWriteHandler(); + ~BytesWriteHandler(); - virtual size_t Write(const void* ptr, size_t size, size_t n) OVERRIDE; - virtual int Seek(int64 offset, int whence) OVERRIDE; - virtual int64 Tell() OVERRIDE; - virtual int Flush() OVERRIDE; - virtual bool MayBlock() OVERRIDE { return false; } + size_t Write(const void* ptr, size_t size, size_t n) OVERRIDE; + int Seek(int64 offset, int whence) OVERRIDE; + int64 Tell() OVERRIDE; + int Flush() OVERRIDE; + bool MayBlock() OVERRIDE { return false; } void* GetData() { return data_; } int64 GetDataSize() { return offset_; } diff --git a/tests/cefclient/cefclient_osr_widget_gtk.h b/tests/cefclient/cefclient_osr_widget_gtk.h index c2e01f557..dc7615656 100644 --- a/tests/cefclient/cefclient_osr_widget_gtk.h +++ b/tests/cefclient/cefclient_osr_widget_gtk.h @@ -40,30 +40,30 @@ class OSRWindow : public ClientHandler::RenderHandler { } // ClientHandler::RenderHandler methods - virtual void OnBeforeClose(CefRefPtr browser) OVERRIDE; + void OnBeforeClose(CefRefPtr browser) OVERRIDE; // CefRenderHandler methods - virtual bool GetViewRect(CefRefPtr browser, - CefRect& rect) OVERRIDE; - virtual bool GetScreenPoint(CefRefPtr browser, - int viewX, - int viewY, - int& screenX, - int& screenY) OVERRIDE; - virtual void OnPopupShow(CefRefPtr browser, - bool show) OVERRIDE; - virtual void OnPopupSize(CefRefPtr browser, - const CefRect& rect) OVERRIDE; - virtual void OnPaint(CefRefPtr browser, - PaintElementType type, - const RectList& dirtyRects, - const void* buffer, - int width, - int height) OVERRIDE; - virtual void OnCursorChange(CefRefPtr browser, - CefCursorHandle cursor, - CursorType type, - const CefCursorInfo& custom_cursor_info) OVERRIDE; + bool GetViewRect(CefRefPtr browser, + CefRect& rect) OVERRIDE; + bool GetScreenPoint(CefRefPtr browser, + int viewX, + int viewY, + int& screenX, + int& screenY) OVERRIDE; + void OnPopupShow(CefRefPtr browser, + bool show) OVERRIDE; + void OnPopupSize(CefRefPtr browser, + const CefRect& rect) OVERRIDE; + void OnPaint(CefRefPtr browser, + PaintElementType type, + const RectList& dirtyRects, + const void* buffer, + int width, + int height) OVERRIDE; + void OnCursorChange(CefRefPtr browser, + CefCursorHandle cursor, + CursorType type, + const CefCursorInfo& custom_cursor_info) OVERRIDE; void Invalidate(); bool IsOverPopupWidget(int x, int y) const; @@ -76,7 +76,7 @@ class OSRWindow : public ClientHandler::RenderHandler { bool transparent, bool show_update_rect, ClientWindowHandle parentView); - virtual ~OSRWindow(); + ~OSRWindow(); void Render(); void EnableGL(); diff --git a/tests/cefclient/cefclient_osr_widget_mac.h b/tests/cefclient/cefclient_osr_widget_mac.h index f2ee675a4..c7a22c851 100644 --- a/tests/cefclient/cefclient_osr_widget_mac.h +++ b/tests/cefclient/cefclient_osr_widget_mac.h @@ -60,51 +60,43 @@ class ClientOSRHandler : public ClientHandler::RenderHandler { public: explicit ClientOSRHandler(ClientOpenGLView* view, OSRBrowserProvider* browser_provider); - virtual ~ClientOSRHandler(); + ~ClientOSRHandler(); void Disconnect(); // ClientHandler::RenderHandler - virtual void OnBeforeClose(CefRefPtr browser) OVERRIDE; + void OnBeforeClose(CefRefPtr browser) OVERRIDE; // CefRenderHandler methods - - virtual bool GetViewRect(CefRefPtr browser, - CefRect& rect) OVERRIDE; - - virtual bool GetScreenPoint(CefRefPtr browser, - int viewX, - int viewY, - int& screenX, - int& screenY) OVERRIDE; - virtual bool GetScreenInfo(CefRefPtr browser, - CefScreenInfo& screen_info) OVERRIDE; - - virtual void OnPopupShow(CefRefPtr browser, - bool show) OVERRIDE; - - virtual void OnPopupSize(CefRefPtr browser, - const CefRect& rect) OVERRIDE; - - virtual void OnPaint(CefRefPtr browser, - PaintElementType type, - const RectList& dirtyRects, - const void* buffer, - int width, int height) OVERRIDE; - - virtual void OnCursorChange(CefRefPtr browser, - CefCursorHandle cursor, - CursorType type, - const CefCursorInfo& custom_cursor_info) OVERRIDE; - - virtual bool StartDragging(CefRefPtr browser, - CefRefPtr drag_data, - CefRenderHandler::DragOperationsMask allowed_ops, - int x, int y) OVERRIDE; - - virtual void UpdateDragCursor( + bool GetViewRect(CefRefPtr browser, + CefRect& rect) OVERRIDE; + bool GetScreenPoint(CefRefPtr browser, + int viewX, + int viewY, + int& screenX, + int& screenY) OVERRIDE; + bool GetScreenInfo(CefRefPtr browser, + CefScreenInfo& screen_info) OVERRIDE; + void OnPopupShow(CefRefPtr browser, + bool show) OVERRIDE; + void OnPopupSize(CefRefPtr browser, + const CefRect& rect) OVERRIDE; + void OnPaint(CefRefPtr browser, + PaintElementType type, + const RectList& dirtyRects, + const void* buffer, + int width, int height) OVERRIDE; + void OnCursorChange(CefRefPtr browser, + CefCursorHandle cursor, + CursorType type, + const CefCursorInfo& custom_cursor_info) OVERRIDE; + bool StartDragging(CefRefPtr browser, + CefRefPtr drag_data, + CefRenderHandler::DragOperationsMask allowed_ops, + int x, int y) OVERRIDE; + void UpdateDragCursor( CefRefPtr browser, - CefRenderHandler::DragOperation operation)OVERRIDE; + CefRenderHandler::DragOperation operation) OVERRIDE; CefWindowHandle view() { return view_; } @@ -139,7 +131,6 @@ class OSRWindow { bool show_update_rect, CefWindowHandle parentView, const CefRect& frame); - ~OSRWindow(); CefRefPtr render_client; diff --git a/tests/cefclient/cefclient_osr_widget_win.h b/tests/cefclient/cefclient_osr_widget_win.h index 5a0dc3fb7..ecf54f2db 100644 --- a/tests/cefclient/cefclient_osr_widget_win.h +++ b/tests/cefclient/cefclient_osr_widget_win.h @@ -46,51 +46,50 @@ class OSRWindow : public ClientHandler::RenderHandler } // ClientHandler::RenderHandler methods - virtual void OnBeforeClose(CefRefPtr browser) OVERRIDE; + void OnBeforeClose(CefRefPtr browser) OVERRIDE; // CefRenderHandler methods - virtual bool GetRootScreenRect(CefRefPtr browser, - CefRect& rect) OVERRIDE; - virtual bool GetViewRect(CefRefPtr browser, - CefRect& rect) OVERRIDE; - virtual bool GetScreenPoint(CefRefPtr browser, - int viewX, - int viewY, - int& screenX, - int& screenY) OVERRIDE; - virtual void OnPopupShow(CefRefPtr browser, - bool show) OVERRIDE; - virtual void OnPopupSize(CefRefPtr browser, - const CefRect& rect) OVERRIDE; - virtual void OnPaint(CefRefPtr browser, - PaintElementType type, - const RectList& dirtyRects, - const void* buffer, - int width, - int height) OVERRIDE; - virtual void OnCursorChange(CefRefPtr browser, - CefCursorHandle cursor, - CursorType type, - const CefCursorInfo& custom_cursor_info) OVERRIDE; - virtual bool StartDragging(CefRefPtr browser, - CefRefPtr drag_data, - CefRenderHandler::DragOperationsMask allowed_ops, - int x, int y) OVERRIDE; - - virtual void UpdateDragCursor( + bool GetRootScreenRect(CefRefPtr browser, + CefRect& rect) OVERRIDE; + bool GetViewRect(CefRefPtr browser, + CefRect& rect) OVERRIDE; + bool GetScreenPoint(CefRefPtr browser, + int viewX, + int viewY, + int& screenX, + int& screenY) OVERRIDE; + void OnPopupShow(CefRefPtr browser, + bool show) OVERRIDE; + void OnPopupSize(CefRefPtr browser, + const CefRect& rect) OVERRIDE; + void OnPaint(CefRefPtr browser, + PaintElementType type, + const RectList& dirtyRects, + const void* buffer, + int width, + int height) OVERRIDE; + void OnCursorChange(CefRefPtr browser, + CefCursorHandle cursor, + CursorType type, + const CefCursorInfo& custom_cursor_info) OVERRIDE; + bool StartDragging(CefRefPtr browser, + CefRefPtr drag_data, + CefRenderHandler::DragOperationsMask allowed_ops, + int x, int y) OVERRIDE; + void UpdateDragCursor( CefRefPtr browser, CefRenderHandler::DragOperation operation) OVERRIDE; #if defined(CEF_USE_ATL) // DragEvents methods - virtual CefBrowserHost::DragOperationsMask OnDragEnter( + CefBrowserHost::DragOperationsMask OnDragEnter( CefRefPtr drag_data, CefMouseEvent ev, CefBrowserHost::DragOperationsMask effect) OVERRIDE; - virtual CefBrowserHost::DragOperationsMask OnDragOver(CefMouseEvent ev, + CefBrowserHost::DragOperationsMask OnDragOver(CefMouseEvent ev, CefBrowserHost::DragOperationsMask effect) OVERRIDE; - virtual void OnDragLeave() OVERRIDE; - virtual CefBrowserHost::DragOperationsMask OnDrop(CefMouseEvent ev, + void OnDragLeave() OVERRIDE; + CefBrowserHost::DragOperationsMask OnDrop(CefMouseEvent ev, CefBrowserHost::DragOperationsMask effect) OVERRIDE; #endif // defined(CEF_USE_ATL) @@ -104,7 +103,7 @@ class OSRWindow : public ClientHandler::RenderHandler OSRWindow(OSRBrowserProvider* browser_provider, bool transparent, bool show_update_rect); - virtual ~OSRWindow(); + ~OSRWindow(); void Render(); void EnableGL(); diff --git a/tests/cefclient/client_app.h b/tests/cefclient/client_app.h index 10fcbe6c6..8b5023e50 100644 --- a/tests/cefclient/client_app.h +++ b/tests/cefclient/client_app.h @@ -120,51 +120,51 @@ class ClientApp : public CefApp, static CefRefPtr CreatePrintHandler(); // CefApp methods. - virtual void OnRegisterCustomSchemes( + void OnRegisterCustomSchemes( CefRefPtr registrar) OVERRIDE; - virtual CefRefPtr GetBrowserProcessHandler() - OVERRIDE { return this; } - virtual CefRefPtr GetRenderProcessHandler() - OVERRIDE { return this; } + CefRefPtr GetBrowserProcessHandler() OVERRIDE { + return this; + } + CefRefPtr GetRenderProcessHandler() OVERRIDE { + return this; + } // CefBrowserProcessHandler methods. - virtual void OnContextInitialized() OVERRIDE; - virtual void OnBeforeChildProcessLaunch( + void OnContextInitialized() OVERRIDE; + void OnBeforeChildProcessLaunch( CefRefPtr command_line) OVERRIDE; - virtual void OnRenderProcessThreadCreated(CefRefPtr extra_info) - OVERRIDE; - virtual CefRefPtr GetPrintHandler() OVERRIDE { + void OnRenderProcessThreadCreated( + CefRefPtr extra_info) OVERRIDE; + CefRefPtr GetPrintHandler() OVERRIDE { return print_handler_; } // CefRenderProcessHandler methods. - virtual void OnRenderThreadCreated(CefRefPtr extra_info) - OVERRIDE; - virtual void OnWebKitInitialized() OVERRIDE; - virtual void OnBrowserCreated(CefRefPtr browser) OVERRIDE; - virtual void OnBrowserDestroyed(CefRefPtr browser) OVERRIDE; - virtual CefRefPtr GetLoadHandler() OVERRIDE; - virtual bool OnBeforeNavigation(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr request, - NavigationType navigation_type, - bool is_redirect) OVERRIDE; - virtual void OnContextCreated(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr context) OVERRIDE; - virtual void OnContextReleased(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr context) OVERRIDE; - virtual void OnUncaughtException(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr context, - CefRefPtr exception, - CefRefPtr stackTrace) - OVERRIDE; - virtual void OnFocusedNodeChanged(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr node) OVERRIDE; - virtual bool OnProcessMessageReceived( + void OnRenderThreadCreated(CefRefPtr extra_info) OVERRIDE; + void OnWebKitInitialized() OVERRIDE; + void OnBrowserCreated(CefRefPtr browser) OVERRIDE; + void OnBrowserDestroyed(CefRefPtr browser) OVERRIDE; + CefRefPtr GetLoadHandler() OVERRIDE; + bool OnBeforeNavigation(CefRefPtr browser, + CefRefPtr frame, + CefRefPtr request, + NavigationType navigation_type, + bool is_redirect) OVERRIDE; + void OnContextCreated(CefRefPtr browser, + CefRefPtr frame, + CefRefPtr context) OVERRIDE; + void OnContextReleased(CefRefPtr browser, + CefRefPtr frame, + CefRefPtr context) OVERRIDE; + void OnUncaughtException(CefRefPtr browser, + CefRefPtr frame, + CefRefPtr context, + CefRefPtr exception, + CefRefPtr stackTrace) OVERRIDE; + void OnFocusedNodeChanged(CefRefPtr browser, + CefRefPtr frame, + CefRefPtr node) OVERRIDE; + bool OnProcessMessageReceived( CefRefPtr browser, CefProcessId source_process, CefRefPtr message) OVERRIDE; diff --git a/tests/cefclient/client_handler.h b/tests/cefclient/client_handler.h index dc08da430..1edc90ae1 100644 --- a/tests/cefclient/client_handler.h +++ b/tests/cefclient/client_handler.h @@ -52,202 +52,202 @@ class ClientHandler : public CefClient, typedef std::set MessageHandlerSet; ClientHandler(); - virtual ~ClientHandler(); + ~ClientHandler(); // CefClient methods - virtual CefRefPtr GetContextMenuHandler() OVERRIDE { + CefRefPtr GetContextMenuHandler() OVERRIDE { return this; } - virtual CefRefPtr GetDialogHandler() OVERRIDE { + CefRefPtr GetDialogHandler() OVERRIDE { return this; } - virtual CefRefPtr GetDisplayHandler() OVERRIDE { + CefRefPtr GetDisplayHandler() OVERRIDE { return this; } - virtual CefRefPtr GetDownloadHandler() OVERRIDE { + CefRefPtr GetDownloadHandler() OVERRIDE { return this; } - virtual CefRefPtr GetDragHandler() OVERRIDE { + CefRefPtr GetDragHandler() OVERRIDE { return this; } - virtual CefRefPtr GetGeolocationHandler() OVERRIDE { + CefRefPtr GetGeolocationHandler() OVERRIDE { return this; } - virtual CefRefPtr GetJSDialogHandler() OVERRIDE { + CefRefPtr GetJSDialogHandler() OVERRIDE { return this; } - virtual CefRefPtr GetKeyboardHandler() OVERRIDE { + CefRefPtr GetKeyboardHandler() OVERRIDE { return this; } - virtual CefRefPtr GetLifeSpanHandler() OVERRIDE { + CefRefPtr GetLifeSpanHandler() OVERRIDE { return this; } - virtual CefRefPtr GetLoadHandler() OVERRIDE { + CefRefPtr GetLoadHandler() OVERRIDE { return this; } - virtual CefRefPtr GetRenderHandler() OVERRIDE { + CefRefPtr GetRenderHandler() OVERRIDE { return this; } - virtual CefRefPtr GetRequestHandler() OVERRIDE { + CefRefPtr GetRequestHandler() OVERRIDE { return this; } - virtual bool OnProcessMessageReceived(CefRefPtr browser, - CefProcessId source_process, - CefRefPtr message) - OVERRIDE; + bool OnProcessMessageReceived(CefRefPtr browser, + CefProcessId source_process, + CefRefPtr message) + OVERRIDE; // CefContextMenuHandler methods - virtual void OnBeforeContextMenu(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr params, - CefRefPtr model) OVERRIDE; - virtual bool OnContextMenuCommand(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr params, - int command_id, - EventFlags event_flags) OVERRIDE; + void OnBeforeContextMenu(CefRefPtr browser, + CefRefPtr frame, + CefRefPtr params, + CefRefPtr model) OVERRIDE; + bool OnContextMenuCommand(CefRefPtr browser, + CefRefPtr frame, + CefRefPtr params, + int command_id, + EventFlags event_flags) OVERRIDE; // CefDialogHandler methods - virtual bool OnFileDialog(CefRefPtr browser, - FileDialogMode mode, - const CefString& title, - const CefString& default_file_path, - const std::vector& accept_filters, - int selected_accept_filter, - CefRefPtr callback) OVERRIDE; + bool OnFileDialog(CefRefPtr browser, + FileDialogMode mode, + const CefString& title, + const CefString& default_file_path, + const std::vector& accept_filters, + int selected_accept_filter, + CefRefPtr callback) OVERRIDE; // CefDisplayHandler methods - virtual void OnAddressChange(CefRefPtr browser, - CefRefPtr frame, - const CefString& url) OVERRIDE; - virtual void OnTitleChange(CefRefPtr browser, - const CefString& title) OVERRIDE; - virtual bool OnConsoleMessage(CefRefPtr browser, - const CefString& message, - const CefString& source, - int line) OVERRIDE; + void OnAddressChange(CefRefPtr browser, + CefRefPtr frame, + const CefString& url) OVERRIDE; + void OnTitleChange(CefRefPtr browser, + const CefString& title) OVERRIDE; + bool OnConsoleMessage(CefRefPtr browser, + const CefString& message, + const CefString& source, + int line) OVERRIDE; // CefDownloadHandler methods - virtual void OnBeforeDownload( + void OnBeforeDownload( CefRefPtr browser, CefRefPtr download_item, const CefString& suggested_name, CefRefPtr callback) OVERRIDE; - virtual void OnDownloadUpdated( + void OnDownloadUpdated( CefRefPtr browser, CefRefPtr download_item, CefRefPtr callback) OVERRIDE; // CefDragHandler methods - virtual bool OnDragEnter(CefRefPtr browser, - CefRefPtr dragData, - CefDragHandler::DragOperationsMask mask) OVERRIDE; + bool OnDragEnter(CefRefPtr browser, + CefRefPtr dragData, + CefDragHandler::DragOperationsMask mask) OVERRIDE; // CefGeolocationHandler methods - virtual bool OnRequestGeolocationPermission( + bool OnRequestGeolocationPermission( CefRefPtr browser, const CefString& requesting_url, int request_id, CefRefPtr callback) OVERRIDE; // CefJSDialogHandler methods - virtual bool OnJSDialog(CefRefPtr browser, - const CefString& origin_url, - const CefString& accept_lang, - JSDialogType dialog_type, - const CefString& message_text, - const CefString& default_prompt_text, - CefRefPtr callback, - bool& suppress_message) OVERRIDE; - virtual bool OnBeforeUnloadDialog( + bool OnJSDialog(CefRefPtr browser, + const CefString& origin_url, + const CefString& accept_lang, + JSDialogType dialog_type, + const CefString& message_text, + const CefString& default_prompt_text, + CefRefPtr callback, + bool& suppress_message) OVERRIDE; + bool OnBeforeUnloadDialog( CefRefPtr browser, const CefString& message_text, bool is_reload, CefRefPtr callback) OVERRIDE; - virtual void OnResetDialogState(CefRefPtr browser) OVERRIDE; + void OnResetDialogState(CefRefPtr browser) OVERRIDE; // CefKeyboardHandler methods - virtual bool OnPreKeyEvent(CefRefPtr browser, - const CefKeyEvent& event, - CefEventHandle os_event, - bool* is_keyboard_shortcut) OVERRIDE; + bool OnPreKeyEvent(CefRefPtr browser, + const CefKeyEvent& event, + CefEventHandle os_event, + bool* is_keyboard_shortcut) OVERRIDE; // CefLifeSpanHandler methods - virtual bool OnBeforePopup(CefRefPtr browser, - CefRefPtr frame, - const CefString& target_url, - const CefString& target_frame_name, - const CefPopupFeatures& popupFeatures, - CefWindowInfo& windowInfo, - CefRefPtr& client, - CefBrowserSettings& settings, - bool* no_javascript_access) OVERRIDE; - virtual void OnAfterCreated(CefRefPtr browser) OVERRIDE; - virtual bool DoClose(CefRefPtr browser) OVERRIDE; - virtual void OnBeforeClose(CefRefPtr browser) OVERRIDE; + bool OnBeforePopup(CefRefPtr browser, + CefRefPtr frame, + const CefString& target_url, + const CefString& target_frame_name, + const CefPopupFeatures& popupFeatures, + CefWindowInfo& windowInfo, + CefRefPtr& client, + CefBrowserSettings& settings, + bool* no_javascript_access) OVERRIDE; + void OnAfterCreated(CefRefPtr browser) OVERRIDE; + bool DoClose(CefRefPtr browser) OVERRIDE; + void OnBeforeClose(CefRefPtr browser) OVERRIDE; // CefLoadHandler methods - virtual void OnLoadingStateChange(CefRefPtr browser, - bool isLoading, - bool canGoBack, - bool canGoForward) OVERRIDE; - virtual void OnLoadError(CefRefPtr browser, - CefRefPtr frame, - ErrorCode errorCode, - const CefString& errorText, - const CefString& failedUrl) OVERRIDE; + void OnLoadingStateChange(CefRefPtr browser, + bool isLoading, + bool canGoBack, + bool canGoForward) OVERRIDE; + void OnLoadError(CefRefPtr browser, + CefRefPtr frame, + ErrorCode errorCode, + const CefString& errorText, + const CefString& failedUrl) OVERRIDE; // CefRequestHandler methods - virtual bool OnBeforeBrowse(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr request, - bool is_redirect) OVERRIDE; - virtual CefRefPtr GetResourceHandler( + bool OnBeforeBrowse(CefRefPtr browser, + CefRefPtr frame, + CefRefPtr request, + bool is_redirect) OVERRIDE; + CefRefPtr GetResourceHandler( CefRefPtr browser, CefRefPtr frame, CefRefPtr request) OVERRIDE; - virtual bool OnQuotaRequest(CefRefPtr browser, - const CefString& origin_url, - int64 new_size, - CefRefPtr callback) OVERRIDE; - virtual void OnProtocolExecution(CefRefPtr browser, - const CefString& url, - bool& allow_os_execution) OVERRIDE; - virtual void OnRenderProcessTerminated(CefRefPtr browser, - TerminationStatus status) OVERRIDE; + bool OnQuotaRequest(CefRefPtr browser, + const CefString& origin_url, + int64 new_size, + CefRefPtr callback) OVERRIDE; + void OnProtocolExecution(CefRefPtr browser, + const CefString& url, + bool& allow_os_execution) OVERRIDE; + void OnRenderProcessTerminated(CefRefPtr browser, + TerminationStatus status) OVERRIDE; // CefRenderHandler methods - virtual bool GetRootScreenRect(CefRefPtr browser, - CefRect& rect) OVERRIDE; - virtual bool GetViewRect(CefRefPtr browser, - CefRect& rect) OVERRIDE; - virtual bool GetScreenPoint(CefRefPtr browser, - int viewX, - int viewY, - int& screenX, - int& screenY) OVERRIDE; - virtual bool GetScreenInfo(CefRefPtr browser, - CefScreenInfo& screen_info) OVERRIDE; - virtual void OnPopupShow(CefRefPtr browser, bool show) OVERRIDE; - virtual void OnPopupSize(CefRefPtr browser, - const CefRect& rect) OVERRIDE; - virtual void OnPaint(CefRefPtr browser, - PaintElementType type, - const RectList& dirtyRects, - const void* buffer, - int width, - int height) OVERRIDE; - virtual void OnCursorChange(CefRefPtr browser, - CefCursorHandle cursor, - CursorType type, - const CefCursorInfo& custom_cursor_info) OVERRIDE; - virtual bool StartDragging(CefRefPtr browser, - CefRefPtr drag_data, - CefRenderHandler::DragOperationsMask allowed_ops, - int x, int y) OVERRIDE; - virtual void UpdateDragCursor(CefRefPtr browser, - CefRenderHandler::DragOperation operation) - OVERRIDE; + bool GetRootScreenRect(CefRefPtr browser, + CefRect& rect) OVERRIDE; + bool GetViewRect(CefRefPtr browser, + CefRect& rect) OVERRIDE; + bool GetScreenPoint(CefRefPtr browser, + int viewX, + int viewY, + int& screenX, + int& screenY) OVERRIDE; + bool GetScreenInfo(CefRefPtr browser, + CefScreenInfo& screen_info) OVERRIDE; + void OnPopupShow(CefRefPtr browser, bool show) OVERRIDE; + void OnPopupSize(CefRefPtr browser, + const CefRect& rect) OVERRIDE; + void OnPaint(CefRefPtr browser, + PaintElementType type, + const RectList& dirtyRects, + const void* buffer, + int width, + int height) OVERRIDE; + void OnCursorChange(CefRefPtr browser, + CefCursorHandle cursor, + CursorType type, + const CefCursorInfo& custom_cursor_info) OVERRIDE; + bool StartDragging(CefRefPtr browser, + CefRefPtr drag_data, + CefRenderHandler::DragOperationsMask allowed_ops, + int x, int y) OVERRIDE; + void UpdateDragCursor(CefRefPtr browser, + CefRenderHandler::DragOperation operation) + OVERRIDE; void SetMainWindowHandle(ClientWindowHandle handle); ClientWindowHandle GetMainWindowHandle() const;