summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/error_console
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-03 17:40:32 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-04 00:40:55 +0000
commita15bee143f21dcc0fb91b8b7f81848a7e51a38bb (patch)
tree10b6e06058381b392a2e0147360afea9de38b36b /chrome/browser/extensions/error_console
parente7c9f7781cbc6db099dacbefdc19ac2fd9bfc19a (diff)
downloadchromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.zip
chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.tar.gz
chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.tar.bz2
replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/
BUG=417463 Review URL: https://codereview.chromium.org/624153002 Cr-Commit-Position: refs/heads/master@{#298134}
Diffstat (limited to 'chrome/browser/extensions/error_console')
-rw-r--r--chrome/browser/extensions/error_console/error_console.h10
-rw-r--r--chrome/browser/extensions/error_console/error_console_browsertest.cc8
-rw-r--r--chrome/browser/extensions/error_console/error_console_unittest.cc2
3 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/extensions/error_console/error_console.h b/chrome/browser/extensions/error_console/error_console.h
index 3553c46..6f586ec 100644
--- a/chrome/browser/extensions/error_console/error_console.h
+++ b/chrome/browser/extensions/error_console/error_console.h
@@ -129,16 +129,16 @@ class ErrorConsole : public content::NotificationObserver,
virtual void OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) OVERRIDE;
+ UnloadedExtensionInfo::Reason reason) override;
virtual void OnExtensionLoaded(content::BrowserContext* browser_context,
- const Extension* extension) OVERRIDE;
+ const Extension* extension) override;
virtual void OnExtensionInstalled(content::BrowserContext* browser_context,
const Extension* extension,
- bool is_update) OVERRIDE;
+ bool is_update) override;
virtual void OnExtensionUninstalled(
content::BrowserContext* browser_context,
const Extension* extension,
- extensions::UninstallReason reason) OVERRIDE;
+ extensions::UninstallReason reason) override;
// Add manifest errors from an extension's install warnings.
void AddManifestErrorsForExtension(const Extension* extension);
@@ -146,7 +146,7 @@ class ErrorConsole : public content::NotificationObserver,
// content::NotificationObserver implementation.
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE;
+ const content::NotificationDetails& details) override;
// Returns the applicable bit mask of reporting preferences for the extension.
int GetMaskForExtension(const std::string& extension_id) const;
diff --git a/chrome/browser/extensions/error_console/error_console_browsertest.cc b/chrome/browser/extensions/error_console/error_console_browsertest.cc
index 9eb3c4c..1d9e96a 100644
--- a/chrome/browser/extensions/error_console/error_console_browsertest.cc
+++ b/chrome/browser/extensions/error_console/error_console_browsertest.cc
@@ -154,7 +154,7 @@ class ErrorConsoleBrowserTest : public ExtensionBrowserTest {
}
// ErrorConsole::Observer implementation.
- virtual void OnErrorAdded(const ExtensionError* error) OVERRIDE {
+ virtual void OnErrorAdded(const ExtensionError* error) override {
++errors_observed_;
if (errors_observed_ >= errors_expected_) {
if (waiting_)
@@ -162,7 +162,7 @@ class ErrorConsoleBrowserTest : public ExtensionBrowserTest {
}
}
- virtual void OnErrorConsoleDestroyed() OVERRIDE {
+ virtual void OnErrorConsoleDestroyed() override {
error_console_ = NULL;
}
@@ -199,7 +199,7 @@ class ErrorConsoleBrowserTest : public ExtensionBrowserTest {
ACTION_NONE
};
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ virtual void SetUpInProcessBrowserTestFixture() override {
ExtensionBrowserTest::SetUpInProcessBrowserTestFixture();
// We need to enable the ErrorConsole FeatureSwitch in order to collect
@@ -209,7 +209,7 @@ class ErrorConsoleBrowserTest : public ExtensionBrowserTest {
FeatureSwitch::OVERRIDE_ENABLED);
}
- virtual void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() override {
ExtensionBrowserTest::SetUpOnMainThread();
// Errors are only kept if we have Developer Mode enabled.
diff --git a/chrome/browser/extensions/error_console/error_console_unittest.cc b/chrome/browser/extensions/error_console/error_console_unittest.cc
index b6f18ab..768bc9c 100644
--- a/chrome/browser/extensions/error_console/error_console_unittest.cc
+++ b/chrome/browser/extensions/error_console/error_console_unittest.cc
@@ -32,7 +32,7 @@ class ErrorConsoleUnitTest : public testing::Test {
ErrorConsoleUnitTest() : error_console_(NULL) { }
virtual ~ErrorConsoleUnitTest() { }
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
testing::Test::SetUp();
// Errors are only kept if we have the FeatureSwitch and have Developer Mode