summaryrefslogtreecommitdiffstats
path: root/content/browser/devtools
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-12 02:08:01 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-12 02:08:01 +0000
commitc3e3589c3e2dd1bc2e80d708fd49414376b2da8e (patch)
treeb024190741fb05211f5d8f600bb93c0237b0eed3 /content/browser/devtools
parent3b22093c5ea7fd343be8d40f6e229ca7e4eaef8c (diff)
downloadchromium_src-c3e3589c3e2dd1bc2e80d708fd49414376b2da8e.zip
chromium_src-c3e3589c3e2dd1bc2e80d708fd49414376b2da8e.tar.gz
chromium_src-c3e3589c3e2dd1bc2e80d708fd49414376b2da8e.tar.bz2
Linux/ChromeOS Chromium style checker cleanup, content/ edition.
Automated clean up of style checker errors that were missed due to the plugin not being executed on implementation files. BUG=115047 Review URL: https://chromiumcodereview.appspot.com/12210030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/devtools')
-rw-r--r--content/browser/devtools/devtools_http_handler_impl.cc8
-rw-r--r--content/browser/devtools/devtools_http_handler_unittest.cc10
-rw-r--r--content/browser/devtools/devtools_manager_unittest.cc9
3 files changed, 16 insertions, 11 deletions
diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc
index c629892..bbe4c46 100644
--- a/content/browser/devtools/devtools_http_handler_impl.cc
+++ b/content/browser/devtools/devtools_http_handler_impl.cc
@@ -112,10 +112,10 @@ class DevToolsClientHostImpl : public DevToolsClientHost {
detach_reason_("target_closed") {
}
- ~DevToolsClientHostImpl() {}
+ virtual ~DevToolsClientHostImpl() {}
// DevToolsClientHost interface
- virtual void InspectedContentsClosing() {
+ virtual void InspectedContentsClosing() OVERRIDE {
if (is_closed_)
return;
is_closed_ = true;
@@ -135,7 +135,7 @@ class DevToolsClientHostImpl : public DevToolsClientHost {
base::Bind(&net::HttpServer::Close, server_, connection_id_));
}
- virtual void DispatchOnInspectorFrontend(const std::string& data) {
+ virtual void DispatchOnInspectorFrontend(const std::string& data) OVERRIDE {
message_loop_->PostTask(
FROM_HERE,
base::Bind(&net::HttpServer::SendOverWebSocket,
@@ -144,7 +144,7 @@ class DevToolsClientHostImpl : public DevToolsClientHost {
data));
}
- virtual void ReplacedWithAnotherClient() {
+ virtual void ReplacedWithAnotherClient() OVERRIDE {
detach_reason_ = "replaced_with_devtools";
}
diff --git a/content/browser/devtools/devtools_http_handler_unittest.cc b/content/browser/devtools/devtools_http_handler_unittest.cc
index 0396ff8..a06c61d 100644
--- a/content/browser/devtools/devtools_http_handler_unittest.cc
+++ b/content/browser/devtools/devtools_http_handler_unittest.cc
@@ -61,9 +61,13 @@ class DummyDelegate : public DevToolsHttpHandlerDelegate {
virtual base::FilePath GetDebugFrontendDir() OVERRIDE {
return base::FilePath();
}
- virtual std::string GetPageThumbnailData(const GURL& url) { return ""; }
- virtual RenderViewHost* CreateNewTarget() { return NULL; }
- virtual TargetType GetTargetType(RenderViewHost*) { return kTargetTypeTab; }
+ virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE {
+ return "";
+ }
+ virtual RenderViewHost* CreateNewTarget() OVERRIDE { return NULL; }
+ virtual TargetType GetTargetType(RenderViewHost*) OVERRIDE {
+ return kTargetTypeTab;
+ }
};
}
diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc
index a816af7..d95da47 100644
--- a/content/browser/devtools/devtools_manager_unittest.cc
+++ b/content/browser/devtools/devtools_manager_unittest.cc
@@ -38,15 +38,16 @@ class TestDevToolsClientHost : public DevToolsClientHost {
manager->ClientHostClosing(this);
closed_ = true;
}
- virtual void InspectedContentsClosing() {
+ virtual void InspectedContentsClosing() OVERRIDE {
FAIL();
}
- virtual void DispatchOnInspectorFrontend(const std::string& message) {
+ virtual void DispatchOnInspectorFrontend(
+ const std::string& message) OVERRIDE {
last_sent_message = &message;
}
- virtual void ReplacedWithAnotherClient() {
+ virtual void ReplacedWithAnotherClient() OVERRIDE {
}
static void ResetCounters() {
@@ -71,7 +72,7 @@ class TestWebContentsDelegate : public WebContentsDelegate {
TestWebContentsDelegate() : renderer_unresponsive_received_(false) {}
// Notification that the contents is hung.
- virtual void RendererUnresponsive(WebContents* source) {
+ virtual void RendererUnresponsive(WebContents* source) OVERRIDE {
renderer_unresponsive_received_ = true;
}