diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 16:51:06 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 16:51:06 +0000 |
commit | 0d5c08e06dc7c5e0f2895134cdd9c34c2402551c (patch) | |
tree | e3d11f0e103415425ba1d00468ecf38458bda2b0 /chrome/browser/debugger | |
parent | 1a80b85a916168de948d92abf355df4e20529080 (diff) | |
download | chromium_src-0d5c08e06dc7c5e0f2895134cdd9c34c2402551c.zip chromium_src-0d5c08e06dc7c5e0f2895134cdd9c34c2402551c.tar.gz chromium_src-0d5c08e06dc7c5e0f2895134cdd9c34c2402551c.tar.bz2 |
Add OVERRIDE to chrome/browser/.
BUG=104314
TEST=no change
Review URL: http://codereview.chromium.org/8612007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger')
9 files changed, 44 insertions, 40 deletions
diff --git a/chrome/browser/debugger/browser_list_tabcontents_provider.h b/chrome/browser/debugger/browser_list_tabcontents_provider.h index f37ee3c..7fdc2d0 100644 --- a/chrome/browser/debugger/browser_list_tabcontents_provider.h +++ b/chrome/browser/debugger/browser_list_tabcontents_provider.h @@ -15,9 +15,10 @@ class BrowserListTabContentsProvider virtual ~BrowserListTabContentsProvider() {} // DevToolsHttpProtocolHandler::Delegate overrides. - virtual DevToolsHttpProtocolHandler::InspectableTabs GetInspectableTabs(); - virtual std::string GetDiscoveryPageHTML(); - virtual net::URLRequestContext* GetURLRequestContext(); + virtual DevToolsHttpProtocolHandler::InspectableTabs + GetInspectableTabs() OVERRIDE; + virtual std::string GetDiscoveryPageHTML() OVERRIDE; + virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(BrowserListTabContentsProvider); }; diff --git a/chrome/browser/debugger/debugger_remote_service.h b/chrome/browser/debugger/debugger_remote_service.h index 02d75d3..7635117 100644 --- a/chrome/browser/debugger/debugger_remote_service.h +++ b/chrome/browser/debugger/debugger_remote_service.h @@ -68,11 +68,11 @@ class DebuggerRemoteService : public DevToolsRemoteListener { // Processes |message| from the remote debugger, where the tool is // "V8Debugger". Either sends the reply immediately or waits for an // asynchronous response from the V8 debugger. - virtual void HandleMessage(const DevToolsRemoteMessage& message); + virtual void HandleMessage(const DevToolsRemoteMessage& message) OVERRIDE; // Gets invoked on the remote debugger [socket] connection loss. // Notifies the InspectableTabProxy of the remote debugger detachment. - virtual void OnConnectionLost(); + virtual void OnConnectionLost() OVERRIDE; // Specifies a tool name ("V8Debugger") handled by this class. static const char kToolName[]; diff --git a/chrome/browser/debugger/devtools_protocol_handler.h b/chrome/browser/debugger/devtools_protocol_handler.h index b1b9158d..03ddf16 100644 --- a/chrome/browser/debugger/devtools_protocol_handler.h +++ b/chrome/browser/debugger/devtools_protocol_handler.h @@ -51,12 +51,12 @@ class DevToolsProtocolHandler } // DevToolsRemoteListener interface - virtual void HandleMessage(const DevToolsRemoteMessage& message); - virtual void OnAcceptConnection(net::ListenSocket *connection); - virtual void OnConnectionLost(); + virtual void HandleMessage(const DevToolsRemoteMessage& message) OVERRIDE; + virtual void OnAcceptConnection(net::ListenSocket *connection) OVERRIDE; + virtual void OnConnectionLost() OVERRIDE; // OutboundSocketDelegate interface - virtual void Send(const DevToolsRemoteMessage& message); + virtual void Send(const DevToolsRemoteMessage& message) OVERRIDE; private: explicit DevToolsProtocolHandler(int port); diff --git a/chrome/browser/debugger/devtools_remote_listen_socket.h b/chrome/browser/debugger/devtools_remote_listen_socket.h index 40212f4..ec97c86 100644 --- a/chrome/browser/debugger/devtools_remote_listen_socket.h +++ b/chrome/browser/debugger/devtools_remote_listen_socket.h @@ -27,20 +27,20 @@ class DevToolsRemoteListenSocket DevToolsRemoteListener* message_listener); protected: - virtual void Listen(); - virtual void Accept(); - virtual void Close(); - virtual void SendInternal(const char* bytes, int len); + virtual void Listen() OVERRIDE; + virtual void Accept() OVERRIDE; + virtual void Close() OVERRIDE; + virtual void SendInternal(const char* bytes, int len) OVERRIDE; private: virtual ~DevToolsRemoteListenSocket(); // net::ListenSocket::ListenSocketDelegate interface virtual void DidAccept(net::ListenSocket *server, - net::ListenSocket *connection); + net::ListenSocket *connection) OVERRIDE; virtual void DidRead(net::ListenSocket *connection, - const char* data, int len); - virtual void DidClose(net::ListenSocket *connection); + const char* data, int len) OVERRIDE; + virtual void DidClose(net::ListenSocket *connection) OVERRIDE; // The protocol states while reading socket input enum State { diff --git a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h index 0b9b36b..cb79650 100644 --- a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h +++ b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h @@ -86,9 +86,9 @@ class DevToolsRemoteListenSocketTester : bool NextAction(int timeout); // DevToolsRemoteMessageHandler interface - virtual void HandleMessage(const DevToolsRemoteMessage& message); - virtual void OnAcceptConnection(net::ListenSocket* connection); - virtual void OnConnectionLost(); + virtual void HandleMessage(const DevToolsRemoteMessage& message) OVERRIDE; + virtual void OnAcceptConnection(net::ListenSocket* connection) OVERRIDE; + virtual void OnConnectionLost() OVERRIDE; // read all pending data from the test socket int ClearTestSocket(); diff --git a/chrome/browser/debugger/devtools_remote_service.h b/chrome/browser/debugger/devtools_remote_service.h index c06ccf5..7ce914c 100644 --- a/chrome/browser/debugger/devtools_remote_service.h +++ b/chrome/browser/debugger/devtools_remote_service.h @@ -29,8 +29,8 @@ class DevToolsRemoteService : public DevToolsRemoteListener { explicit DevToolsRemoteService(DevToolsProtocolHandler* delegate); // DevToolsRemoteListener interface - virtual void HandleMessage(const DevToolsRemoteMessage& message); - virtual void OnConnectionLost() {} + virtual void HandleMessage(const DevToolsRemoteMessage& message) OVERRIDE; + virtual void OnConnectionLost() OVERRIDE {} static const char kToolName[]; diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h index 311b2b7..8bdd58f 100644 --- a/chrome/browser/debugger/devtools_window.h +++ b/chrome/browser/debugger/devtools_window.h @@ -57,10 +57,10 @@ class DevToolsWindow virtual ~DevToolsWindow(); // Overridden from DevToolsClientHost. - virtual void SendMessageToClient(const IPC::Message& message); - virtual void InspectedTabClosing(); - virtual void TabReplaced(TabContents* new_tab); - virtual RenderViewHost* GetClientRenderViewHost(); + virtual void SendMessageToClient(const IPC::Message& message) OVERRIDE; + virtual void InspectedTabClosing() OVERRIDE; + virtual void TabReplaced(TabContents* new_tab) OVERRIDE; + virtual RenderViewHost* GetClientRenderViewHost() OVERRIDE; RenderViewHost* GetRenderViewHost(); void Show(DevToolsToggleAction action); @@ -85,7 +85,7 @@ class DevToolsWindow // Overridden from content::NotificationObserver. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; void ScheduleAction(DevToolsToggleAction action); void DoAction(); @@ -109,15 +109,17 @@ class DevToolsWindow TabContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, - bool user_gesture); - virtual void CloseContents(TabContents* source) {} - virtual bool CanReloadContents(TabContents* source) const; + bool user_gesture) OVERRIDE; + virtual void CloseContents(TabContents* source) OVERRIDE {} + virtual bool CanReloadContents(TabContents* source) const OVERRIDE; virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, - bool* is_keyboard_shortcut); - virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event); - virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator(); + bool* is_keyboard_shortcut) OVERRIDE; + virtual void HandleKeyboardEvent( + const NativeWebKeyboardEvent& event) OVERRIDE; + virtual content::JavaScriptDialogCreator* + GetJavaScriptDialogCreator() OVERRIDE; - virtual void FrameNavigating(const std::string& url) {} + virtual void FrameNavigating(const std::string& url) OVERRIDE {} static DevToolsWindow* ToggleDevToolsWindow(RenderViewHost* inspected_rvh, bool force_open, diff --git a/chrome/browser/debugger/extension_ports_remote_service.h b/chrome/browser/debugger/extension_ports_remote_service.h index ce1aa4a..f0796d4 100644 --- a/chrome/browser/debugger/extension_ports_remote_service.h +++ b/chrome/browser/debugger/extension_ports_remote_service.h @@ -44,17 +44,17 @@ class ExtensionPortsRemoteService : public DevToolsRemoteListener, // Processes |message| from the external client (where the tool is // "ExtensionPorts"). - virtual void HandleMessage(const DevToolsRemoteMessage& message); + virtual void HandleMessage(const DevToolsRemoteMessage& message) OVERRIDE; // Gets invoked on the external client socket connection loss. // Closes open message ports. - virtual void OnConnectionLost(); + virtual void OnConnectionLost() OVERRIDE; // IPC::Message::Sender methods: // This is the callback through which the ExtensionMessageService // passes us messages from extensions as well as disconnect events. - virtual bool Send(IPC::Message* msg); + virtual bool Send(IPC::Message* msg) OVERRIDE; private: // Operation result returned in the "result" field in messages sent diff --git a/chrome/browser/debugger/inspectable_tab_proxy.h b/chrome/browser/debugger/inspectable_tab_proxy.h index 90aef6b..ab1d6ce 100644 --- a/chrome/browser/debugger/inspectable_tab_proxy.h +++ b/chrome/browser/debugger/inspectable_tab_proxy.h @@ -9,6 +9,7 @@ #include <string> #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/hash_tables.h" #include "content/browser/debugger/devtools_client_host.h" @@ -72,14 +73,14 @@ class DevToolsClientHostImpl : public DevToolsClientHost { void CloseImpl(); // DevToolsClientHost interface - virtual void InspectedTabClosing(); - virtual void SendMessageToClient(const IPC::Message& msg); - virtual void TabReplaced(TabContents* new_tab); + virtual void InspectedTabClosing() OVERRIDE; + virtual void SendMessageToClient(const IPC::Message& msg) OVERRIDE; + virtual void TabReplaced(TabContents* new_tab) OVERRIDE; private: // Message handling routines void OnDebuggerOutput(const std::string& msg); - virtual void FrameNavigating(const std::string& url); + virtual void FrameNavigating(const std::string& url) OVERRIDE; void TabClosed(); int32 id_; |