diff options
| author | mostynb <mostynb@opera.com> | 2014-10-03 17:40:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-04 00:40:55 +0000 |
| commit | a15bee143f21dcc0fb91b8b7f81848a7e51a38bb (patch) | |
| tree | 10b6e06058381b392a2e0147360afea9de38b36b /chrome | |
| parent | e7c9f7781cbc6db099dacbefdc19ac2fd9bfc19a (diff) | |
| download | chromium_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')
519 files changed, 2525 insertions, 2525 deletions
diff --git a/chrome/browser/extensions/active_install_data.h b/chrome/browser/extensions/active_install_data.h index 6a076b8..c225ae6 100644 --- a/chrome/browser/extensions/active_install_data.h +++ b/chrome/browser/extensions/active_install_data.h @@ -49,7 +49,7 @@ class ScopedActiveInstall : public InstallObserver { void Init(); // InstallObserver implementation. - virtual void OnShutdown() OVERRIDE; + virtual void OnShutdown() override; InstallTracker* tracker_; ScopedObserver<InstallTracker, InstallObserver> tracker_observer_; diff --git a/chrome/browser/extensions/active_script_controller.h b/chrome/browser/extensions/active_script_controller.h index 95133f2..082b7f6 100644 --- a/chrome/browser/extensions/active_script_controller.h +++ b/chrome/browser/extensions/active_script_controller.h @@ -117,16 +117,16 @@ class ActiveScriptController : public content::WebContentsObserver, void LogUMA() const; // content::WebContentsObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const content::FrameNavigateParams& params) OVERRIDE; + const content::FrameNavigateParams& params) override; // ExtensionRegistryObserver: virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // The associated browser context. content::BrowserContext* browser_context_; diff --git a/chrome/browser/extensions/active_script_controller_browsertest.cc b/chrome/browser/extensions/active_script_controller_browsertest.cc index 5348d1d..ff1dd41 100644 --- a/chrome/browser/extensions/active_script_controller_browsertest.cc +++ b/chrome/browser/extensions/active_script_controller_browsertest.cc @@ -71,8 +71,8 @@ class ActiveScriptControllerBrowserTest : public ExtensionBrowserTest { public: ActiveScriptControllerBrowserTest() {} - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; - virtual void TearDownOnMainThread() OVERRIDE; + virtual void SetUpCommandLine(base::CommandLine* command_line) override; + virtual void TearDownOnMainThread() override; // Returns an extension with the given |host_type| and |injection_type|. If // one already exists, the existing extension will be returned. Othewrwise, @@ -408,7 +408,7 @@ class FlagOffActiveScriptControllerBrowserTest : public ActiveScriptControllerBrowserTest { private: // Simply don't append the flag. - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(base::CommandLine* command_line) override { ExtensionBrowserTest::SetUpCommandLine(command_line); } }; diff --git a/chrome/browser/extensions/active_script_controller_unittest.cc b/chrome/browser/extensions/active_script_controller_unittest.cc index 20acc0d..ed6ed81 100644 --- a/chrome/browser/extensions/active_script_controller_unittest.cc +++ b/chrome/browser/extensions/active_script_controller_unittest.cc @@ -71,7 +71,7 @@ class ActiveScriptControllerUnitTest : public ChromeRenderViewHostTestHarness { // Increment the number of executions for the given |extension_id|. void IncrementExecutionCount(const std::string& extension_id); - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; // Since ActiveScriptController's behavior is behind a flag, override the // feature switch. diff --git a/chrome/browser/extensions/active_tab_permission_granter.h b/chrome/browser/extensions/active_tab_permission_granter.h index 4945915..68b31f75 100644 --- a/chrome/browser/extensions/active_tab_permission_granter.h +++ b/chrome/browser/extensions/active_tab_permission_granter.h @@ -44,14 +44,14 @@ class ActiveTabPermissionGranter // content::WebContentsObserver implementation. virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const content::FrameNavigateParams& params) OVERRIDE; - virtual void WebContentsDestroyed() OVERRIDE; + const content::FrameNavigateParams& params) override; + virtual void WebContentsDestroyed() override; // extensions::ExtensionRegistryObserver implementation. virtual void OnExtensionUnloaded(content::BrowserContext* browser_context, const Extension* extension, UnloadedExtensionInfo::Reason reason) - OVERRIDE; + override; // Clears any tab-specific permissions for all extensions on |tab_id_| and // notifies renderers. diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc index eebdfe3..e847eff 100644 --- a/chrome/browser/extensions/active_tab_unittest.cc +++ b/chrome/browser/extensions/active_tab_unittest.cc @@ -77,7 +77,7 @@ class ActiveTabTest : public ChromeRenderViewHostTestHarness { true, true)) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); TabHelper::CreateForWebContents(web_contents()); } diff --git a/chrome/browser/extensions/activity_log/activity_database_unittest.cc b/chrome/browser/extensions/activity_log/activity_database_unittest.cc index 40ef876..b653227 100644 --- a/chrome/browser/extensions/activity_log/activity_database_unittest.cc +++ b/chrome/browser/extensions/activity_log/activity_database_unittest.cc @@ -53,10 +53,10 @@ class ActivityDatabaseTestPolicy : public ActivityDatabase::Delegate { virtual void Record(ActivityDatabase* db, scoped_refptr<Action> action); protected: - virtual bool InitDatabase(sql::Connection* db) OVERRIDE; - virtual bool FlushDatabase(sql::Connection*) OVERRIDE; - virtual void OnDatabaseFailure() OVERRIDE {} - virtual void OnDatabaseClose() OVERRIDE { delete this; } + virtual bool InitDatabase(sql::Connection* db) override; + virtual bool FlushDatabase(sql::Connection*) override; + virtual void OnDatabaseFailure() override {} + virtual void OnDatabaseClose() override { delete this; } std::vector<scoped_refptr<Action> > queue_; }; @@ -107,7 +107,7 @@ void ActivityDatabaseTestPolicy::Record(ActivityDatabase* db, class ActivityDatabaseTest : public ChromeRenderViewHostTestHarness { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); #if defined OS_CHROMEOS test_user_manager_.reset(new chromeos::ScopedTestUserManager()); @@ -117,7 +117,7 @@ class ActivityDatabaseTest : public ChromeRenderViewHostTestHarness { switches::kEnableExtensionActivityLogTesting); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { #if defined OS_CHROMEOS test_user_manager_.reset(); #endif diff --git a/chrome/browser/extensions/activity_log/activity_log.h b/chrome/browser/extensions/activity_log/activity_log.h index 60145a7..02ebb7c 100644 --- a/chrome/browser/extensions/activity_log/activity_log.h +++ b/chrome/browser/extensions/activity_log/activity_log.h @@ -87,25 +87,25 @@ class ActivityLog : public BrowserContextKeyedAPI, // We keep track of whether the whitelisted extension is installed; if it is, // we want to recompute whether to have logging enabled. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; virtual void OnExtensionUninstalled( content::BrowserContext* browser_context, const Extension* extension, - extensions::UninstallReason reason) OVERRIDE; + extensions::UninstallReason reason) override; // ApiActivityMonitor. virtual void OnApiEventDispatched( const std::string& extension_id, const std::string& event_name, - scoped_ptr<base::ListValue> event_args) OVERRIDE; + scoped_ptr<base::ListValue> event_args) override; virtual void OnApiFunctionCalled( const std::string& extension_id, const std::string& api_name, - scoped_ptr<base::ListValue> event_args) OVERRIDE; + scoped_ptr<base::ListValue> event_args) override; static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); @@ -152,7 +152,7 @@ class ActivityLog : public BrowserContextKeyedAPI, virtual void OnScriptsExecuted( const content::WebContents* web_contents, const ExecutingScriptsMap& extension_ids, - const GURL& on_url) OVERRIDE; + const GURL& on_url) override; // At the moment, ActivityLog will use only one policy for summarization. // These methods are used to choose and set the most appropriate policy. diff --git a/chrome/browser/extensions/activity_log/activity_log_browsertest.cc b/chrome/browser/extensions/activity_log/activity_log_browsertest.cc index 32a175e..26bf493a 100644 --- a/chrome/browser/extensions/activity_log/activity_log_browsertest.cc +++ b/chrome/browser/extensions/activity_log/activity_log_browsertest.cc @@ -29,7 +29,7 @@ namespace extensions { class ActivityLogPrerenderTest : public ExtensionApiTest { protected: // Make sure the activity log is turned on. - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnableExtensionActivityLogging); command_line->AppendSwitchASCII(switches::kPrerenderMode, diff --git a/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc index ff831014..e701079 100644 --- a/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc +++ b/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc @@ -28,14 +28,14 @@ const char* kExtensionID = "abjoigjokfeibfhiahiijggogladbmfm"; class ActivityLogEnabledTest : public ChromeRenderViewHostTestHarness { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); #if defined OS_CHROMEOS test_user_manager_.reset(new chromeos::ScopedTestUserManager()); #endif } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { #if defined OS_CHROMEOS test_user_manager_.reset(); #endif diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc index 2d5a530..57b803d 100644 --- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc +++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc @@ -56,7 +56,7 @@ namespace extensions { class ActivityLogTest : public ChromeRenderViewHostTestHarness { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); #if defined OS_CHROMEOS test_user_manager_.reset(new chromeos::ScopedTestUserManager()); @@ -72,7 +72,7 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness { base::RunLoop().RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { #if defined OS_CHROMEOS test_user_manager_.reset(); #endif diff --git a/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc b/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc index 1a84629..a0a23eb 100644 --- a/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc +++ b/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc @@ -93,7 +93,7 @@ class ActivityLogObserver : public ActivityLog::Observer { bool found_multiple_injections() const { return found_multiple_injections_; } private: - virtual void OnExtensionActivity(scoped_refptr<Action> action) OVERRIDE; + virtual void OnExtensionActivity(scoped_refptr<Action> action) override; ScopedObserver<ActivityLog, ActivityLog::Observer> scoped_observer_; @@ -142,7 +142,7 @@ class TestAdNetworkDatabase : public AdNetworkDatabase { virtual ~TestAdNetworkDatabase(); private: - virtual bool IsAdNetwork(const GURL& url) const OVERRIDE; + virtual bool IsAdNetwork(const GURL& url) const override; GURL ad_network_url1_; GURL ad_network_url2_; @@ -173,8 +173,8 @@ class AdInjectionBrowserTest : public ExtensionBrowserTest { AdInjectionBrowserTest(); virtual ~AdInjectionBrowserTest(); - virtual void SetUpOnMainThread() OVERRIDE; - virtual void TearDownOnMainThread() OVERRIDE; + virtual void SetUpOnMainThread() override; + virtual void TearDownOnMainThread() override; // Handle the "Reset Begin" stage of the test. testing::AssertionResult HandleResetBeginStage(); diff --git a/chrome/browser/extensions/activity_log/counting_policy.h b/chrome/browser/extensions/activity_log/counting_policy.h index 2c77f16..57b6efa 100644 --- a/chrome/browser/extensions/activity_log/counting_policy.h +++ b/chrome/browser/extensions/activity_log/counting_policy.h @@ -25,7 +25,7 @@ class CountingPolicy : public ActivityLogDatabasePolicy { explicit CountingPolicy(Profile* profile); virtual ~CountingPolicy(); - virtual void ProcessAction(scoped_refptr<Action> action) OVERRIDE; + virtual void ProcessAction(scoped_refptr<Action> action) override; virtual void ReadFilteredData( const std::string& extension_id, @@ -35,9 +35,9 @@ class CountingPolicy : public ActivityLogDatabasePolicy { const std::string& arg_url, const int days_ago, const base::Callback - <void(scoped_ptr<Action::ActionVector>)>& callback) OVERRIDE; + <void(scoped_ptr<Action::ActionVector>)>& callback) override; - virtual void Close() OVERRIDE; + virtual void Close() override; // Gets or sets the amount of time that old records are kept in the database. const base::TimeDelta& retention_time() const { return retention_time_; } @@ -46,16 +46,16 @@ class CountingPolicy : public ActivityLogDatabasePolicy { } // Remove actions (rows) which IDs are specified in the action_ids array. - virtual void RemoveActions(const std::vector<int64>& action_ids) OVERRIDE; + virtual void RemoveActions(const std::vector<int64>& action_ids) override; // Clean the URL data stored for this policy. - virtual void RemoveURLs(const std::vector<GURL>&) OVERRIDE; + virtual void RemoveURLs(const std::vector<GURL>&) override; // Clean the data related to this extension for this policy. - virtual void RemoveExtensionData(const std::string& extension_id) OVERRIDE; + virtual void RemoveExtensionData(const std::string& extension_id) override; // Delete everything in the database. - virtual void DeleteDatabase() OVERRIDE; + virtual void DeleteDatabase() override; // The main database table, and the name for a read-only view that // decompresses string values for easier parsing. @@ -65,10 +65,10 @@ class CountingPolicy : public ActivityLogDatabasePolicy { protected: // The ActivityDatabase::Delegate interface. These are always called from // the database thread. - virtual bool InitDatabase(sql::Connection* db) OVERRIDE; - virtual bool FlushDatabase(sql::Connection* db) OVERRIDE; - virtual void OnDatabaseFailure() OVERRIDE; - virtual void OnDatabaseClose() OVERRIDE; + virtual bool InitDatabase(sql::Connection* db) override; + virtual bool FlushDatabase(sql::Connection* db) override; + virtual void OnDatabaseFailure() override; + virtual void OnDatabaseClose() override; private: // A type used to track pending writes to the database. The key is an action diff --git a/chrome/browser/extensions/activity_log/database_string_table_unittest.cc b/chrome/browser/extensions/activity_log/database_string_table_unittest.cc index 19908ca..961de8c 100644 --- a/chrome/browser/extensions/activity_log/database_string_table_unittest.cc +++ b/chrome/browser/extensions/activity_log/database_string_table_unittest.cc @@ -14,14 +14,14 @@ namespace extensions { class DatabaseStringTableTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); base::FilePath db_file = temp_dir_.path().AppendASCII("StringTable.db"); ASSERT_TRUE(db_.Open(db_file)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { db_.Close(); } diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.h b/chrome/browser/extensions/activity_log/fullstream_ui_policy.h index 84e3491..cdcc446 100644 --- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.h +++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.h @@ -26,7 +26,7 @@ class FullStreamUIPolicy : public ActivityLogDatabasePolicy { // For more info about these member functions, see the super class. explicit FullStreamUIPolicy(Profile* profile); - virtual void ProcessAction(scoped_refptr<Action> action) OVERRIDE; + virtual void ProcessAction(scoped_refptr<Action> action) override; virtual void ReadFilteredData( const std::string& extension_id, @@ -36,21 +36,21 @@ class FullStreamUIPolicy : public ActivityLogDatabasePolicy { const std::string& arg_url, const int days_ago, const base::Callback - <void(scoped_ptr<Action::ActionVector>)>& callback) OVERRIDE; + <void(scoped_ptr<Action::ActionVector>)>& callback) override; - virtual void Close() OVERRIDE; + virtual void Close() override; // Remove the actions stored for this policy according to the passed IDs. - virtual void RemoveActions(const std::vector<int64>& action_ids) OVERRIDE; + virtual void RemoveActions(const std::vector<int64>& action_ids) override; // Clean the URL data stored for this policy. - virtual void RemoveURLs(const std::vector<GURL>& restrict_urls) OVERRIDE; + virtual void RemoveURLs(const std::vector<GURL>& restrict_urls) override; // Clean the data related to this extension for this policy. - virtual void RemoveExtensionData(const std::string& extension_id) OVERRIDE; + virtual void RemoveExtensionData(const std::string& extension_id) override; // Delete everything in the database. - virtual void DeleteDatabase() OVERRIDE; + virtual void DeleteDatabase() override; // Database table schema. static const char* kTableName; @@ -65,10 +65,10 @@ class FullStreamUIPolicy : public ActivityLogDatabasePolicy { // The ActivityDatabase::Delegate interface. These are always called from // the database thread. - virtual bool InitDatabase(sql::Connection* db) OVERRIDE; - virtual bool FlushDatabase(sql::Connection* db) OVERRIDE; - virtual void OnDatabaseFailure() OVERRIDE; - virtual void OnDatabaseClose() OVERRIDE; + virtual bool InitDatabase(sql::Connection* db) override; + virtual bool FlushDatabase(sql::Connection* db) override; + virtual void OnDatabaseFailure() override; + virtual void OnDatabaseClose() override; // Strips arguments if needed by policy. May return the original object (if // unmodified), or a copy (if modifications were made). The implementation diff --git a/chrome/browser/extensions/activity_log/hashed_ad_network_database.h b/chrome/browser/extensions/activity_log/hashed_ad_network_database.h index b542246..c3dad05 100644 --- a/chrome/browser/extensions/activity_log/hashed_ad_network_database.h +++ b/chrome/browser/extensions/activity_log/hashed_ad_network_database.h @@ -23,7 +23,7 @@ class HashedAdNetworkDatabase : public AdNetworkDatabase { private: // AdNetworkDatabase implementation. - virtual bool IsAdNetwork(const GURL& url) const OVERRIDE; + virtual bool IsAdNetwork(const GURL& url) const override; // Points to the array of hash entries. In practice, this is always set to // kHashedAdNetworks, but is exposed via set_entries_for_testing(). diff --git a/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc b/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc index 6c9f89d..9dae73c 100644 --- a/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc +++ b/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc @@ -30,7 +30,7 @@ const size_t kNumAdNetworkHosts = arraysize(kAdNetworkHosts); class HashedAdNetworkDatabaseUnitTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; AdNetworkDatabase* database() { return database_.get(); } diff --git a/chrome/browser/extensions/activity_log/uma_policy.h b/chrome/browser/extensions/activity_log/uma_policy.h index 29d41db..c534f62 100644 --- a/chrome/browser/extensions/activity_log/uma_policy.h +++ b/chrome/browser/extensions/activity_log/uma_policy.h @@ -56,8 +56,8 @@ class UmaPolicy : public ActivityLogPolicy, explicit UmaPolicy(Profile* profile); // ActivityLogPolicy implementation. - virtual void ProcessAction(scoped_refptr<Action> action) OVERRIDE; - virtual void Close() OVERRIDE; + virtual void ProcessAction(scoped_refptr<Action> action) override; + virtual void Close() override; // Gets the histogram name associated with each PageStatus. static const char* GetHistogramName(PageStatus status); @@ -77,19 +77,19 @@ class UmaPolicy : public ActivityLogPolicy, typedef std::map<std::string, ExtensionMap> SiteMap; // BrowserListObserver - virtual void OnBrowserAdded(Browser* browser) OVERRIDE; - virtual void OnBrowserRemoved(Browser* browser) OVERRIDE; + virtual void OnBrowserAdded(Browser* browser) override; + virtual void OnBrowserRemoved(Browser* browser) override; // TabStripModelObserver // Fired when a page loads, either as a new tab or replacing the contents of // an older tab. virtual void TabChangedAt(content::WebContents* contents, int index, - TabChangeType change_type) OVERRIDE; + TabChangeType change_type) override; // Fired when a tab closes. virtual void TabClosingAt(TabStripModel* tab_strip_model, content::WebContents* contents, - int index) OVERRIDE; + int index) override; // Assign a status bitmask based on the action's properties. int MatchActionToStatus(scoped_refptr<Action> action); diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h index 3df12f4f..7e3ddd0 100644 --- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h +++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h @@ -31,7 +31,7 @@ class ActivityLogAPI : public BrowserContextKeyedAPI, // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<ActivityLogAPI>* GetFactoryInstance(); - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // Lookup whether the extension ID is whitelisted. static bool IsExtensionWhitelisted(const std::string& extension_id); @@ -42,12 +42,12 @@ class ActivityLogAPI : public BrowserContextKeyedAPI, // ActivityLog::Observer // We pass this along to activityLogPrivate.onExtensionActivity. - virtual void OnExtensionActivity(scoped_refptr<Action> activity) OVERRIDE; + virtual void OnExtensionActivity(scoped_refptr<Action> activity) override; // EventRouter::Observer // We only keep track of OnExtensionActivity if we have any listeners. - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; - virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; + virtual void OnListenerRemoved(const EventListenerInfo& details) override; content::BrowserContext* browser_context_; ActivityLog* activity_log_; @@ -71,7 +71,7 @@ class ActivityLogPrivateGetExtensionActivitiesFunction virtual ~ActivityLogPrivateGetExtensionActivitiesFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnLookupCompleted( @@ -89,7 +89,7 @@ class ActivityLogPrivateDeleteActivitiesFunction virtual ~ActivityLogPrivateDeleteActivitiesFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; // The implementation of activityLogPrivate.deleteDatabase @@ -103,7 +103,7 @@ class ActivityLogPrivateDeleteDatabaseFunction virtual ~ActivityLogPrivateDeleteDatabaseFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; // The implementation of activityLogPrivate.deleteUrls @@ -117,7 +117,7 @@ class ActivityLogPrivateDeleteUrlsFunction virtual ~ActivityLogPrivateDeleteUrlsFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc index 463f383..01008ce 100644 --- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc +++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc @@ -28,7 +28,7 @@ class ActivityLogApiTest : public ExtensionApiTest { *CommandLine::ForCurrentProcess() = saved_cmdline_; } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); saved_cmdline_ = *CommandLine::ForCurrentProcess(); command_line->AppendSwitch(switches::kEnableExtensionActivityLogging); diff --git a/chrome/browser/extensions/api/alarms/alarm_manager.cc b/chrome/browser/extensions/api/alarms/alarm_manager.cc index 8274800..98705a8 100644 --- a/chrome/browser/extensions/api/alarms/alarm_manager.cc +++ b/chrome/browser/extensions/api/alarms/alarm_manager.cc @@ -42,7 +42,7 @@ class DefaultAlarmDelegate : public AlarmManager::Delegate { virtual ~DefaultAlarmDelegate() {} virtual void OnAlarm(const std::string& extension_id, - const Alarm& alarm) OVERRIDE { + const Alarm& alarm) override { scoped_ptr<base::ListValue> args(new base::ListValue()); args->Append(alarm.js_alarm->ToValue().release()); scoped_ptr<Event> event(new Event(alarms::OnAlarm::kEventName, diff --git a/chrome/browser/extensions/api/alarms/alarm_manager.h b/chrome/browser/extensions/api/alarms/alarm_manager.h index 6912ee2..a0c9711 100644 --- a/chrome/browser/extensions/api/alarms/alarm_manager.h +++ b/chrome/browser/extensions/api/alarms/alarm_manager.h @@ -203,11 +203,11 @@ class AlarmManager : public BrowserContextKeyedAPI, // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUninstalled( content::BrowserContext* browser_context, const Extension* extension, - extensions::UninstallReason reason) OVERRIDE; + extensions::UninstallReason reason) override; // BrowserContextKeyedAPI implementation. static const char* service_name() { diff --git a/chrome/browser/extensions/api/alarms/alarms_api.h b/chrome/browser/extensions/api/alarms/alarms_api.h index 4bbe3398..20e68d0 100644 --- a/chrome/browser/extensions/api/alarms/alarms_api.h +++ b/chrome/browser/extensions/api/alarms/alarms_api.h @@ -27,7 +27,7 @@ class AlarmsCreateFunction : public ChromeAsyncExtensionFunction { virtual ~AlarmsCreateFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; DECLARE_EXTENSION_FUNCTION("alarms.create", ALARMS_CREATE) private: void Callback(); @@ -44,7 +44,7 @@ class AlarmsGetFunction : public ChromeAsyncExtensionFunction { virtual ~AlarmsGetFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Callback(const std::string& name, Alarm* alarm); @@ -56,7 +56,7 @@ class AlarmsGetAllFunction : public ChromeAsyncExtensionFunction { virtual ~AlarmsGetAllFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Callback(const AlarmList* alarms); @@ -68,7 +68,7 @@ class AlarmsClearFunction : public ChromeAsyncExtensionFunction { virtual ~AlarmsClearFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Callback(const std::string& name, bool success); @@ -80,7 +80,7 @@ class AlarmsClearAllFunction : public ChromeAsyncExtensionFunction { virtual ~AlarmsClearAllFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Callback(); diff --git a/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc b/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc index 77e36a4..f3c2d00 100644 --- a/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc +++ b/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc @@ -32,7 +32,7 @@ class AlarmDelegate : public AlarmManager::Delegate { public: virtual ~AlarmDelegate() {} virtual void OnAlarm(const std::string& extension_id, - const Alarm& alarm) OVERRIDE { + const Alarm& alarm) override { alarms_seen.push_back(alarm.js_alarm->name); if (base::MessageLoop::current()->is_running()) base::MessageLoop::current()->Quit(); diff --git a/chrome/browser/extensions/api/audio/audio_api.h b/chrome/browser/extensions/api/audio/audio_api.h index 8a33e85..6bad8f1 100644 --- a/chrome/browser/extensions/api/audio/audio_api.h +++ b/chrome/browser/extensions/api/audio/audio_api.h @@ -24,7 +24,7 @@ class AudioAPI : public BrowserContextKeyedAPI, public AudioService::Observer { static BrowserContextKeyedAPIFactory<AudioAPI>* GetFactoryInstance(); // AudioService::Observer implementation. - virtual void OnDeviceChanged() OVERRIDE; + virtual void OnDeviceChanged() override; private: friend class BrowserContextKeyedAPIFactory<AudioAPI>; @@ -45,7 +45,7 @@ class AudioGetInfoFunction : public ChromeAsyncExtensionFunction { protected: virtual ~AudioGetInfoFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnGetInfoCompleted(const OutputInfo& output_info, @@ -60,7 +60,7 @@ class AudioSetActiveDevicesFunction : public ChromeSyncExtensionFunction { protected: virtual ~AudioSetActiveDevicesFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class AudioSetPropertiesFunction : public ChromeSyncExtensionFunction { @@ -70,7 +70,7 @@ class AudioSetPropertiesFunction : public ChromeSyncExtensionFunction { protected: virtual ~AudioSetPropertiesFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; diff --git a/chrome/browser/extensions/api/audio/audio_service.cc b/chrome/browser/extensions/api/audio/audio_service.cc index e165de2..ebccc3f 100644 --- a/chrome/browser/extensions/api/audio/audio_service.cc +++ b/chrome/browser/extensions/api/audio/audio_service.cc @@ -12,16 +12,16 @@ class AudioServiceImpl : public AudioService { virtual ~AudioServiceImpl() {} // Called by listeners to this service to add/remove themselves as observers. - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; // Start to query audio device information. - virtual void StartGetInfo(const GetInfoCallback& callback) OVERRIDE; - virtual void SetActiveDevices(const DeviceIdList& device_list) OVERRIDE; + virtual void StartGetInfo(const GetInfoCallback& callback) override; + virtual void SetActiveDevices(const DeviceIdList& device_list) override; virtual bool SetDeviceProperties(const std::string& device_id, bool muted, int volume, - int gain) OVERRIDE; + int gain) override; }; void AudioServiceImpl::AddObserver(Observer* observer) { diff --git a/chrome/browser/extensions/api/audio/audio_service_chromeos.cc b/chrome/browser/extensions/api/audio/audio_service_chromeos.cc index a9c9ebd..bc20d21 100644 --- a/chrome/browser/extensions/api/audio/audio_service_chromeos.cc +++ b/chrome/browser/extensions/api/audio/audio_service_chromeos.cc @@ -25,26 +25,26 @@ class AudioServiceImpl : public AudioService, virtual ~AudioServiceImpl(); // Called by listeners to this service to add/remove themselves as observers. - virtual void AddObserver(AudioService::Observer* observer) OVERRIDE; - virtual void RemoveObserver(AudioService::Observer* observer) OVERRIDE; + virtual void AddObserver(AudioService::Observer* observer) override; + virtual void RemoveObserver(AudioService::Observer* observer) override; // Start to query audio device information. - virtual void StartGetInfo(const GetInfoCallback& callback) OVERRIDE; - virtual void SetActiveDevices(const DeviceIdList& device_list) OVERRIDE; + virtual void StartGetInfo(const GetInfoCallback& callback) override; + virtual void SetActiveDevices(const DeviceIdList& device_list) override; virtual bool SetDeviceProperties(const std::string& device_id, bool muted, int volume, - int gain) OVERRIDE; + int gain) override; protected: // chromeos::CrasAudioHandler::AudioObserver overrides. - virtual void OnOutputVolumeChanged() OVERRIDE; - virtual void OnInputGainChanged() OVERRIDE; - virtual void OnOutputMuteChanged() OVERRIDE; - virtual void OnInputMuteChanged() OVERRIDE; - virtual void OnAudioNodesChanged() OVERRIDE; - virtual void OnActiveOutputNodeChanged() OVERRIDE; - virtual void OnActiveInputNodeChanged() OVERRIDE; + virtual void OnOutputVolumeChanged() override; + virtual void OnInputGainChanged() override; + virtual void OnOutputMuteChanged() override; + virtual void OnInputMuteChanged() override; + virtual void OnAudioNodesChanged() override; + virtual void OnActiveOutputNodeChanged() override; + virtual void OnActiveInputNodeChanged() override; private: void NotifyDeviceChanged(); diff --git a/chrome/browser/extensions/api/audio/audio_service_linux.cc b/chrome/browser/extensions/api/audio/audio_service_linux.cc index a592264..625ecec 100644 --- a/chrome/browser/extensions/api/audio/audio_service_linux.cc +++ b/chrome/browser/extensions/api/audio/audio_service_linux.cc @@ -25,16 +25,16 @@ class AudioServiceImpl : public AudioService { private: // Called by listeners to this service to add/remove themselves as observers. - virtual void AddObserver(AudioService::Observer* observer) OVERRIDE; - virtual void RemoveObserver(AudioService::Observer* observer) OVERRIDE; + virtual void AddObserver(AudioService::Observer* observer) override; + virtual void RemoveObserver(AudioService::Observer* observer) override; // Start to query audio device information. - virtual void StartGetInfo(const GetInfoCallback& callback) OVERRIDE; - virtual void SetActiveDevices(const DeviceIdList& device_list) OVERRIDE; + virtual void StartGetInfo(const GetInfoCallback& callback) override; + virtual void SetActiveDevices(const DeviceIdList& device_list) override; virtual bool SetDeviceProperties(const std::string& device_id, bool muted, int volume, - int gain) OVERRIDE; + int gain) override; // List of observers. ObserverList<AudioService::Observer> observer_list_; diff --git a/chrome/browser/extensions/api/automation/automation_apitest.cc b/chrome/browser/extensions/api/automation/automation_apitest.cc index 1fd3b5e..87ce614 100644 --- a/chrome/browser/extensions/api/automation/automation_apitest.cc +++ b/chrome/browser/extensions/api/automation/automation_apitest.cc @@ -64,7 +64,7 @@ class AutomationApiTest : public ExtensionApiTest { } public: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); } }; @@ -322,7 +322,7 @@ class FakeAutomationInternalEnableTabFunction public: FakeAutomationInternalEnableTabFunction() {} - ExtensionFunction::ResponseAction Run() OVERRIDE { + ExtensionFunction::ResponseAction Run() override { using api::automation_internal::EnableTab::Params; scoped_ptr<Params> params(Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -423,7 +423,7 @@ class FakeAutomationInternalPerformActionFunction public: FakeAutomationInternalPerformActionFunction() {} - ExtensionFunction::ResponseAction Run() OVERRIDE { + ExtensionFunction::ResponseAction Run() override { if (state.destroy_tree0) { // Step 4.f: tell the extension to destroy the tree and re-request it. state.SendTreeDestroyedEvent(kTab0Rid, browser_context()); diff --git a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc index 0f56660..7fe564e 100644 --- a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc +++ b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc @@ -74,14 +74,14 @@ class AutomationWebContentsObserver // content::WebContentsObserver overrides. virtual void AccessibilityEventReceived( const std::vector<content::AXEventNotificationDetails>& details) - OVERRIDE { + override { automation_util::DispatchAccessibilityEventsToAutomation( details, browser_context_, web_contents()->GetContainerBounds().OffsetFromOrigin()); } virtual void RenderFrameDeleted( - content::RenderFrameHost* render_frame_host) OVERRIDE { + content::RenderFrameHost* render_frame_host) override { automation_util::DispatchTreeDestroyedEventToAutomation( render_frame_host->GetProcess()->GetID(), render_frame_host->GetRoutingID(), @@ -110,19 +110,19 @@ class RenderFrameHostActionAdapter : public AutomationActionAdapter { virtual ~RenderFrameHostActionAdapter() {} // AutomationActionAdapter implementation. - virtual void DoDefault(int32 id) OVERRIDE { + virtual void DoDefault(int32 id) override { rfh_->AccessibilityDoDefaultAction(id); } - virtual void Focus(int32 id) OVERRIDE { + virtual void Focus(int32 id) override { rfh_->AccessibilitySetFocus(id); } - virtual void MakeVisible(int32 id) OVERRIDE { + virtual void MakeVisible(int32 id) override { rfh_->AccessibilityScrollToMakeVisible(id, gfx::Rect()); } - virtual void SetSelection(int32 id, int32 start, int32 end) OVERRIDE { + virtual void SetSelection(int32 id, int32 start, int32 end) override { rfh_->AccessibilitySetTextSelection(id, start, end); } diff --git a/chrome/browser/extensions/api/automation_internal/automation_internal_api.h b/chrome/browser/extensions/api/automation_internal/automation_internal_api.h index 5aa4dab..c22e0d5 100644 --- a/chrome/browser/extensions/api/automation_internal/automation_internal_api.h +++ b/chrome/browser/extensions/api/automation_internal/automation_internal_api.h @@ -39,7 +39,7 @@ class AutomationInternalEnableTabFunction protected: virtual ~AutomationInternalEnableTabFunction() {} - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; class AutomationInternalPerformActionFunction @@ -49,7 +49,7 @@ class AutomationInternalPerformActionFunction protected: virtual ~AutomationInternalPerformActionFunction() {} - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; private: // Helper function to route an action to an action adapter. @@ -65,7 +65,7 @@ class AutomationInternalEnableDesktopFunction protected: virtual ~AutomationInternalEnableDesktopFunction() {} - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_api.h b/chrome/browser/extensions/api/autotest_private/autotest_private_api.h index daa94d9..c70a63f 100644 --- a/chrome/browser/extensions/api/autotest_private/autotest_private_api.h +++ b/chrome/browser/extensions/api/autotest_private/autotest_private_api.h @@ -19,7 +19,7 @@ class AutotestPrivateLogoutFunction : public ChromeSyncExtensionFunction { private: virtual ~AutotestPrivateLogoutFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class AutotestPrivateRestartFunction : public ChromeSyncExtensionFunction { @@ -28,7 +28,7 @@ class AutotestPrivateRestartFunction : public ChromeSyncExtensionFunction { private: virtual ~AutotestPrivateRestartFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class AutotestPrivateShutdownFunction : public ChromeSyncExtensionFunction { @@ -38,7 +38,7 @@ class AutotestPrivateShutdownFunction : public ChromeSyncExtensionFunction { private: virtual ~AutotestPrivateShutdownFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class AutotestPrivateLoginStatusFunction : public ChromeSyncExtensionFunction { @@ -48,7 +48,7 @@ class AutotestPrivateLoginStatusFunction : public ChromeSyncExtensionFunction { private: virtual ~AutotestPrivateLoginStatusFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class AutotestPrivateLockScreenFunction : public ChromeSyncExtensionFunction { @@ -58,7 +58,7 @@ class AutotestPrivateLockScreenFunction : public ChromeSyncExtensionFunction { private: virtual ~AutotestPrivateLockScreenFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class AutotestPrivateGetExtensionsInfoFunction @@ -69,7 +69,7 @@ class AutotestPrivateGetExtensionsInfoFunction private: virtual ~AutotestPrivateGetExtensionsInfoFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class AutotestPrivateSimulateAsanMemoryBugFunction @@ -80,7 +80,7 @@ class AutotestPrivateSimulateAsanMemoryBugFunction private: virtual ~AutotestPrivateSimulateAsanMemoryBugFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // Don't kill the browser when we're in a browser test. diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h index 137589f..417cf2f 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h @@ -37,12 +37,12 @@ class BookmarkManagerPrivateEventRouter : public BaseBookmarkModelObserver { virtual ~BookmarkManagerPrivateEventRouter(); // BaseBookmarkModelObserver: - virtual void BookmarkModelChanged() OVERRIDE; - virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE; + virtual void BookmarkModelChanged() override; + virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override; virtual void OnWillChangeBookmarkMetaInfo(BookmarkModel* model, - const BookmarkNode* node) OVERRIDE; + const BookmarkNode* node) override; virtual void BookmarkMetaInfoChanged(BookmarkModel* model, - const BookmarkNode* node) OVERRIDE; + const BookmarkNode* node) override; private: // Helper to actually dispatch an event to extension listeners. @@ -63,14 +63,14 @@ class BookmarkManagerPrivateAPI : public BrowserContextKeyedAPI, virtual ~BookmarkManagerPrivateAPI(); // BrowserContextKeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<BookmarkManagerPrivateAPI>* GetFactoryInstance(); // EventRouter::Observer implementation. - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; private: friend class BrowserContextKeyedAPIFactory<BookmarkManagerPrivateAPI>; @@ -95,10 +95,10 @@ class BookmarkManagerPrivateDragEventRouter virtual ~BookmarkManagerPrivateDragEventRouter(); // BookmarkTabHelper::BookmarkDrag interface - virtual void OnDragEnter(const bookmarks::BookmarkNodeData& data) OVERRIDE; - virtual void OnDragOver(const bookmarks::BookmarkNodeData& data) OVERRIDE; - virtual void OnDragLeave(const bookmarks::BookmarkNodeData& data) OVERRIDE; - virtual void OnDrop(const bookmarks::BookmarkNodeData& data) OVERRIDE; + virtual void OnDragEnter(const bookmarks::BookmarkNodeData& data) override; + virtual void OnDragOver(const bookmarks::BookmarkNodeData& data) override; + virtual void OnDragLeave(const bookmarks::BookmarkNodeData& data) override; + virtual void OnDrop(const bookmarks::BookmarkNodeData& data) override; // The bookmark drag and drop data. This gets set after a drop was done on // the page. This returns NULL if no data is available. @@ -136,7 +136,7 @@ class BookmarkManagerPrivateCopyFunction virtual ~BookmarkManagerPrivateCopyFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateCutFunction @@ -149,7 +149,7 @@ class BookmarkManagerPrivateCutFunction virtual ~BookmarkManagerPrivateCutFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivatePasteFunction @@ -162,7 +162,7 @@ class BookmarkManagerPrivatePasteFunction virtual ~BookmarkManagerPrivatePasteFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateCanPasteFunction @@ -175,7 +175,7 @@ class BookmarkManagerPrivateCanPasteFunction virtual ~BookmarkManagerPrivateCanPasteFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateSortChildrenFunction @@ -188,7 +188,7 @@ class BookmarkManagerPrivateSortChildrenFunction virtual ~BookmarkManagerPrivateSortChildrenFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateGetStringsFunction : public AsyncExtensionFunction { @@ -200,7 +200,7 @@ class BookmarkManagerPrivateGetStringsFunction : public AsyncExtensionFunction { virtual ~BookmarkManagerPrivateGetStringsFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class BookmarkManagerPrivateStartDragFunction @@ -213,7 +213,7 @@ class BookmarkManagerPrivateStartDragFunction virtual ~BookmarkManagerPrivateStartDragFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateDropFunction @@ -226,7 +226,7 @@ class BookmarkManagerPrivateDropFunction virtual ~BookmarkManagerPrivateDropFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateGetSubtreeFunction @@ -239,7 +239,7 @@ class BookmarkManagerPrivateGetSubtreeFunction virtual ~BookmarkManagerPrivateGetSubtreeFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateCanEditFunction @@ -252,7 +252,7 @@ class BookmarkManagerPrivateCanEditFunction virtual ~BookmarkManagerPrivateCanEditFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateRecordLaunchFunction @@ -265,7 +265,7 @@ class BookmarkManagerPrivateRecordLaunchFunction virtual ~BookmarkManagerPrivateRecordLaunchFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateCreateWithMetaInfoFunction @@ -278,7 +278,7 @@ class BookmarkManagerPrivateCreateWithMetaInfoFunction virtual ~BookmarkManagerPrivateCreateWithMetaInfoFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateGetMetaInfoFunction @@ -291,7 +291,7 @@ class BookmarkManagerPrivateGetMetaInfoFunction virtual ~BookmarkManagerPrivateGetMetaInfoFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateSetMetaInfoFunction @@ -304,7 +304,7 @@ class BookmarkManagerPrivateSetMetaInfoFunction virtual ~BookmarkManagerPrivateSetMetaInfoFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateUpdateMetaInfoFunction @@ -317,7 +317,7 @@ class BookmarkManagerPrivateUpdateMetaInfoFunction virtual ~BookmarkManagerPrivateUpdateMetaInfoFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateCanOpenNewWindowsFunction @@ -330,7 +330,7 @@ class BookmarkManagerPrivateCanOpenNewWindowsFunction virtual ~BookmarkManagerPrivateCanOpenNewWindowsFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateRemoveTreesFunction @@ -343,7 +343,7 @@ class BookmarkManagerPrivateRemoveTreesFunction virtual ~BookmarkManagerPrivateRemoveTreesFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateUndoFunction @@ -356,7 +356,7 @@ class BookmarkManagerPrivateUndoFunction virtual ~BookmarkManagerPrivateUndoFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateRedoFunction @@ -369,7 +369,7 @@ class BookmarkManagerPrivateRedoFunction virtual ~BookmarkManagerPrivateRedoFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateGetUndoInfoFunction @@ -382,7 +382,7 @@ class BookmarkManagerPrivateGetUndoInfoFunction virtual ~BookmarkManagerPrivateGetUndoInfoFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarkManagerPrivateGetRedoInfoFunction @@ -395,7 +395,7 @@ class BookmarkManagerPrivateGetRedoInfoFunction virtual ~BookmarkManagerPrivateGetRedoInfoFunction() {} // ExtensionFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc index fc52a534..0852e68 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc @@ -31,7 +31,7 @@ class ExtensionBookmarksTest : public testing::Test { ExtensionBookmarksTest() : client_(NULL), model_(NULL), node_(NULL), node2_(NULL), folder_(NULL) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { profile_.CreateBookmarkModel(false); model_ = BookmarkModelFactory::GetForProfile(&profile_); client_ = ChromeBookmarkClientFactory::GetForProfile(&profile_); diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h index 32efbb8..544d67f 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h @@ -46,32 +46,32 @@ class BookmarkEventRouter : public BookmarkModelObserver { // BookmarkModelObserver: virtual void BookmarkModelLoaded(BookmarkModel* model, - bool ids_reassigned) OVERRIDE; - virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE; + bool ids_reassigned) override; + virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override; virtual void BookmarkNodeMoved(BookmarkModel* model, const BookmarkNode* old_parent, int old_index, const BookmarkNode* new_parent, - int new_index) OVERRIDE; + int new_index) override; virtual void BookmarkNodeAdded(BookmarkModel* model, const BookmarkNode* parent, - int index) OVERRIDE; + int index) override; virtual void BookmarkNodeRemoved(BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node, - const std::set<GURL>& removed_urls) OVERRIDE; + const std::set<GURL>& removed_urls) override; virtual void BookmarkAllUserNodesRemoved( BookmarkModel* model, - const std::set<GURL>& removed_urls) OVERRIDE; + const std::set<GURL>& removed_urls) override; virtual void BookmarkNodeChanged(BookmarkModel* model, - const BookmarkNode* node) OVERRIDE; + const BookmarkNode* node) override; virtual void BookmarkNodeFaviconChanged(BookmarkModel* model, - const BookmarkNode* node) OVERRIDE; + const BookmarkNode* node) override; virtual void BookmarkNodeChildrenReordered(BookmarkModel* model, - const BookmarkNode* node) OVERRIDE; - virtual void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) OVERRIDE; - virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE; + const BookmarkNode* node) override; + virtual void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) override; + virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override; private: // Helper to actually dispatch an event to extension listeners. @@ -92,14 +92,14 @@ class BookmarksAPI : public BrowserContextKeyedAPI, virtual ~BookmarksAPI(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<BookmarksAPI>* GetFactoryInstance(); // EventRouter::Observer implementation. virtual void OnListenerAdded( - const EventListenerInfo& details) OVERRIDE; + const EventListenerInfo& details) override; private: friend class BrowserContextKeyedAPIFactory<BookmarksAPI>; @@ -120,7 +120,7 @@ class BookmarksFunction : public ChromeAsyncExtensionFunction, public BaseBookmarkModelObserver { public: // AsyncExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; protected: virtual ~BookmarksFunction() {} @@ -163,9 +163,9 @@ class BookmarksFunction : public ChromeAsyncExtensionFunction, private: // BaseBookmarkModelObserver: - virtual void BookmarkModelChanged() OVERRIDE; + virtual void BookmarkModelChanged() override; virtual void BookmarkModelLoaded(BookmarkModel* model, - bool ids_reassigned) OVERRIDE; + bool ids_reassigned) override; }; class BookmarksGetFunction : public BookmarksFunction { @@ -176,7 +176,7 @@ class BookmarksGetFunction : public BookmarksFunction { virtual ~BookmarksGetFunction() {} // BookmarksFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarksGetChildrenFunction : public BookmarksFunction { @@ -187,7 +187,7 @@ class BookmarksGetChildrenFunction : public BookmarksFunction { virtual ~BookmarksGetChildrenFunction() {} // BookmarksFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarksGetRecentFunction : public BookmarksFunction { @@ -198,7 +198,7 @@ class BookmarksGetRecentFunction : public BookmarksFunction { virtual ~BookmarksGetRecentFunction() {} // BookmarksFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarksGetTreeFunction : public BookmarksFunction { @@ -209,7 +209,7 @@ class BookmarksGetTreeFunction : public BookmarksFunction { virtual ~BookmarksGetTreeFunction() {} // BookmarksFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarksGetSubTreeFunction : public BookmarksFunction { @@ -220,7 +220,7 @@ class BookmarksGetSubTreeFunction : public BookmarksFunction { virtual ~BookmarksGetSubTreeFunction() {} // BookmarksFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarksSearchFunction : public BookmarksFunction { @@ -231,7 +231,7 @@ class BookmarksSearchFunction : public BookmarksFunction { virtual ~BookmarksSearchFunction() {} // BookmarksFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarksRemoveFunction : public BookmarksFunction { @@ -248,7 +248,7 @@ class BookmarksRemoveFunction : public BookmarksFunction { virtual ~BookmarksRemoveFunction() {} // BookmarksFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarksRemoveTreeFunction : public BookmarksRemoveFunction { @@ -267,7 +267,7 @@ class BookmarksCreateFunction : public BookmarksFunction { virtual ~BookmarksCreateFunction() {} // BookmarksFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarksMoveFunction : public BookmarksFunction { @@ -282,7 +282,7 @@ class BookmarksMoveFunction : public BookmarksFunction { virtual ~BookmarksMoveFunction() {} // BookmarksFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarksUpdateFunction : public BookmarksFunction { @@ -297,7 +297,7 @@ class BookmarksUpdateFunction : public BookmarksFunction { virtual ~BookmarksUpdateFunction() {} // BookmarksFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarksIOFunction : public BookmarksFunction, @@ -309,8 +309,8 @@ class BookmarksIOFunction : public BookmarksFunction, // ui::SelectFileDialog::Listener: virtual void MultiFilesSelected(const std::vector<base::FilePath>& files, - void* params) OVERRIDE; - virtual void FileSelectionCanceled(void* params) OVERRIDE; + void* params) override; + virtual void FileSelectionCanceled(void* params) override; void SelectFile(ui::SelectFileDialog::Type type); @@ -333,13 +333,13 @@ class BookmarksImportFunction : public BookmarksIOFunction { // BookmarkManagerIOFunction: virtual void FileSelected(const base::FilePath& path, int index, - void* params) OVERRIDE; + void* params) override; private: virtual ~BookmarksImportFunction() {} // BookmarksFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; class BookmarksExportFunction : public BookmarksIOFunction { @@ -349,13 +349,13 @@ class BookmarksExportFunction : public BookmarksIOFunction { // BookmarkManagerIOFunction: virtual void FileSelected(const base::FilePath& path, int index, - void* params) OVERRIDE; + void* params) override; private: virtual ~BookmarksExportFunction() {} // BookmarksFunction: - virtual bool RunOnReady() OVERRIDE; + virtual bool RunOnReady() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h index 41c2b82..21ed094 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h +++ b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h @@ -23,10 +23,10 @@ namespace braille_display_private { class BrailleControllerImpl : public BrailleController { public: static BrailleControllerImpl* GetInstance(); - virtual scoped_ptr<DisplayState> GetDisplayState() OVERRIDE; - virtual void WriteDots(const std::string& cells) OVERRIDE; - virtual void AddObserver(BrailleObserver* observer) OVERRIDE; - virtual void RemoveObserver(BrailleObserver* observer) OVERRIDE; + virtual scoped_ptr<DisplayState> GetDisplayState() override; + virtual void WriteDots(const std::string& cells) override; + virtual void AddObserver(BrailleObserver* observer) override; + virtual void RemoveObserver(BrailleObserver* observer) override; private: // For the unit tests. diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc b/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc index 2b1e358..6ba977d 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc +++ b/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc @@ -17,10 +17,10 @@ namespace braille_display_private { class BrailleControllerImpl : public BrailleController { public: static BrailleControllerImpl* GetInstance(); - virtual scoped_ptr<DisplayState> GetDisplayState() OVERRIDE; - virtual void WriteDots(const std::string& cells) OVERRIDE; - virtual void AddObserver(BrailleObserver* observer) OVERRIDE; - virtual void RemoveObserver(BrailleObserver* observer) OVERRIDE; + virtual scoped_ptr<DisplayState> GetDisplayState() override; + virtual void WriteDots(const std::string& cells) override; + virtual void AddObserver(BrailleObserver* observer) override; + virtual void RemoveObserver(BrailleObserver* observer) override; private: BrailleControllerImpl(); diff --git a/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc b/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc index f9d1955..d188cad 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc +++ b/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc @@ -30,8 +30,8 @@ class BrailleDisplayPrivateAPI::DefaultEventDelegate DefaultEventDelegate(EventRouter::Observer* observer, Profile* profile); virtual ~DefaultEventDelegate(); - virtual void BroadcastEvent(scoped_ptr<Event> event) OVERRIDE; - virtual bool HasListener() OVERRIDE; + virtual void BroadcastEvent(scoped_ptr<Event> event) override; + virtual bool HasListener() override; private: EventRouter::Observer* observer_; diff --git a/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h b/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h index 6c049d6..d27554e 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h +++ b/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h @@ -30,7 +30,7 @@ class BrailleDisplayPrivateAPI : public BrowserContextKeyedAPI, virtual ~BrailleDisplayPrivateAPI(); // ProfileKeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<BrailleDisplayPrivateAPI>* @@ -38,13 +38,13 @@ class BrailleDisplayPrivateAPI : public BrowserContextKeyedAPI, // BrailleObserver implementation. virtual void OnBrailleDisplayStateChanged( - const api::braille_display_private::DisplayState& display_state) OVERRIDE; + const api::braille_display_private::DisplayState& display_state) override; virtual void OnBrailleKeyEvent( - const api::braille_display_private::KeyEvent& keyEvent) OVERRIDE; + const api::braille_display_private::KeyEvent& keyEvent) override; // EventRouter::Observer implementation. - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; - virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; + virtual void OnListenerRemoved(const EventListenerInfo& details) override; private: @@ -86,9 +86,9 @@ class BrailleDisplayPrivateGetDisplayStateFunction : public AsyncApiFunction { BRAILLEDISPLAYPRIVATE_GETDISPLAYSTATE) protected: virtual ~BrailleDisplayPrivateGetDisplayStateFunction() {} - virtual bool Prepare() OVERRIDE; - virtual void Work() OVERRIDE; - virtual bool Respond() OVERRIDE; + virtual bool Prepare() override; + virtual void Work() override; + virtual bool Respond() override; }; class BrailleDisplayPrivateWriteDotsFunction : public AsyncApiFunction { @@ -99,9 +99,9 @@ class BrailleDisplayPrivateWriteDotsFunction : public AsyncApiFunction { protected: virtual ~BrailleDisplayPrivateWriteDotsFunction(); - virtual bool Prepare() OVERRIDE; - virtual void Work() OVERRIDE; - virtual bool Respond() OVERRIDE; + virtual bool Prepare() override; + virtual void Work() override; + virtual bool Respond() override; private: scoped_ptr<braille_display_private::WriteDots::Params> params_; diff --git a/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc b/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc index 41e9dcb..e13e2bb31 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc +++ b/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc @@ -69,7 +69,7 @@ class MockBrlapiConnection : public BrlapiConnection { explicit MockBrlapiConnection(MockBrlapiConnectionData* data) : data_(data) {} virtual ConnectResult Connect(const OnDataReadyCallback& on_data_ready) - OVERRIDE { + override { data_->connected = true; on_data_ready_ = on_data_ready; if (!data_->pending_keys.empty()) { @@ -80,7 +80,7 @@ class MockBrlapiConnection : public BrlapiConnection { return CONNECT_SUCCESS; } - virtual void Disconnect() OVERRIDE { + virtual void Disconnect() override { data_->connected = false; if (data_->reappear_on_disconnect) { data_->display_size *= 2; @@ -91,31 +91,31 @@ class MockBrlapiConnection : public BrlapiConnection { } } - virtual bool Connected() OVERRIDE { + virtual bool Connected() override { return data_->connected; } - virtual brlapi_error_t* BrlapiError() OVERRIDE { + virtual brlapi_error_t* BrlapiError() override { return &data_->error; } - virtual std::string BrlapiStrError() OVERRIDE { + virtual std::string BrlapiStrError() override { return data_->error.brlerrno != BRLAPI_ERROR_SUCCESS ? "Error" : "Success"; } - virtual bool GetDisplaySize(size_t* size) OVERRIDE { + virtual bool GetDisplaySize(size_t* size) override { *size = data_->display_size; return true; } - virtual bool WriteDots(const unsigned char* cells) OVERRIDE { + virtual bool WriteDots(const unsigned char* cells) override { std::string written(reinterpret_cast<const char*>(cells), data_->display_size); data_->written_content.push_back(written); return true; } - virtual int ReadKey(brlapi_keyCode_t* key_code) OVERRIDE { + virtual int ReadKey(brlapi_keyCode_t* key_code) override { if (!data_->pending_keys.empty()) { brlapi_keyCode_t queued_key_code = data_->pending_keys.front(); data_->pending_keys.pop_front(); @@ -147,7 +147,7 @@ class MockBrlapiConnection : public BrlapiConnection { class BrailleDisplayPrivateApiTest : public ExtensionApiTest { public: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); connection_data_.connected = false; connection_data_.display_size = 0; @@ -268,7 +268,7 @@ IN_PROC_BROWSER_TEST_F(BrailleDisplayPrivateApiTest, DisplayStateChanges) { class BrailleDisplayPrivateAPIUserTest : public BrailleDisplayPrivateApiTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(chromeos::switches::kLoginManager); command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, TestingProfile::kTestUserProfileDir); @@ -280,10 +280,10 @@ class BrailleDisplayPrivateAPIUserTest : public BrailleDisplayPrivateApiTest { int GetEventCount() { return event_count_; } - virtual void BroadcastEvent(scoped_ptr<Event> event) OVERRIDE { + virtual void BroadcastEvent(scoped_ptr<Event> event) override { ++event_count_; } - virtual bool HasListener() OVERRIDE { return true; } + virtual bool HasListener() override { return true; } private: int event_count_; @@ -318,7 +318,7 @@ class BrailleDisplayPrivateAPIUserTest : public BrailleDisplayPrivateApiTest { } protected: - virtual void DisableAccessibilityManagerBraille() OVERRIDE { + virtual void DisableAccessibilityManagerBraille() override { // Let the accessibility manager behave as usual for these tests. } }; diff --git a/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc b/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc index 59b29b8..a17b345 100644 --- a/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc +++ b/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc @@ -38,21 +38,21 @@ class BrlapiConnectionImpl : public BrlapiConnection, } virtual ConnectResult Connect(const OnDataReadyCallback& on_data_ready) - OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual bool Connected() OVERRIDE { return handle_; } - virtual brlapi_error_t* BrlapiError() OVERRIDE; - virtual std::string BrlapiStrError() OVERRIDE; - virtual bool GetDisplaySize(size_t* size) OVERRIDE; - virtual bool WriteDots(const unsigned char* cells) OVERRIDE; - virtual int ReadKey(brlapi_keyCode_t* keyCode) OVERRIDE; + override; + virtual void Disconnect() override; + virtual bool Connected() override { return handle_; } + virtual brlapi_error_t* BrlapiError() override; + virtual std::string BrlapiStrError() override; + virtual bool GetDisplaySize(size_t* size) override; + virtual bool WriteDots(const unsigned char* cells) override; + virtual int ReadKey(brlapi_keyCode_t* keyCode) override; // MessageLoopForIO::Watcher - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE { + virtual void OnFileCanReadWithoutBlocking(int fd) override { on_data_ready_.Run(); } - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE {} + virtual void OnFileCanWriteWithoutBlocking(int fd) override {} private: bool CheckConnected(); diff --git a/chrome/browser/extensions/api/braille_display_private/mock_braille_controller.h b/chrome/browser/extensions/api/braille_display_private/mock_braille_controller.h index 6eeb8b4..f7e680e 100644 --- a/chrome/browser/extensions/api/braille_display_private/mock_braille_controller.h +++ b/chrome/browser/extensions/api/braille_display_private/mock_braille_controller.h @@ -16,9 +16,9 @@ class MockBrailleController : public StubBrailleController { public: MockBrailleController(); - virtual scoped_ptr<DisplayState> GetDisplayState() OVERRIDE; - virtual void AddObserver(BrailleObserver* observer) OVERRIDE; - virtual void RemoveObserver(BrailleObserver* observer) OVERRIDE; + virtual scoped_ptr<DisplayState> GetDisplayState() override; + virtual void AddObserver(BrailleObserver* observer) override; + virtual void RemoveObserver(BrailleObserver* observer) override; // Sets the available flag without calling the observer. void SetAvailable(bool available); diff --git a/chrome/browser/extensions/api/braille_display_private/stub_braille_controller.h b/chrome/browser/extensions/api/braille_display_private/stub_braille_controller.h index c90726e..da803e4 100644 --- a/chrome/browser/extensions/api/braille_display_private/stub_braille_controller.h +++ b/chrome/browser/extensions/api/braille_display_private/stub_braille_controller.h @@ -15,10 +15,10 @@ namespace braille_display_private { class StubBrailleController : public BrailleController { public: StubBrailleController(); - virtual scoped_ptr<DisplayState> GetDisplayState() OVERRIDE; - virtual void WriteDots(const std::string& cells) OVERRIDE; - virtual void AddObserver(BrailleObserver* observer) OVERRIDE; - virtual void RemoveObserver(BrailleObserver* observer) OVERRIDE; + virtual scoped_ptr<DisplayState> GetDisplayState() override; + virtual void WriteDots(const std::string& cells) override; + virtual void AddObserver(BrailleObserver* observer) override; + virtual void RemoveObserver(BrailleObserver* observer) override; }; } // namespace braille_display_private diff --git a/chrome/browser/extensions/api/browser/browser_api.h b/chrome/browser/extensions/api/browser/browser_api.h index 5707857..e291605 100644 --- a/chrome/browser/extensions/api/browser/browser_api.h +++ b/chrome/browser/extensions/api/browser/browser_api.h @@ -18,7 +18,7 @@ class BrowserOpenTabFunction : public ChromeSyncExtensionFunction { protected: virtual ~BrowserOpenTabFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace api diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.h b/chrome/browser/extensions/api/browsing_data/browsing_data_api.h index 1e8a73a..71da2c7 100644 --- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.h +++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.h @@ -57,7 +57,7 @@ class BrowsingDataSettingsFunction : public ChromeSyncExtensionFunction { DECLARE_EXTENSION_FUNCTION("browsingData.settings", BROWSINGDATA_SETTINGS) // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; protected: virtual ~BrowsingDataSettingsFunction() {} @@ -84,10 +84,10 @@ class BrowsingDataRemoverFunction : public ChromeAsyncExtensionFunction, public BrowsingDataRemover::Observer { public: // BrowsingDataRemover::Observer interface method. - virtual void OnBrowsingDataRemoverDone() OVERRIDE; + virtual void OnBrowsingDataRemoverDone() override; // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; protected: virtual ~BrowsingDataRemoverFunction() {} @@ -123,7 +123,7 @@ class BrowsingDataRemoveAppcacheFunction : public BrowsingDataRemoverFunction { virtual ~BrowsingDataRemoveAppcacheFunction() {} // BrowsingDataRemoverFunction: - virtual int GetRemovalMask() OVERRIDE; + virtual int GetRemovalMask() override; }; class BrowsingDataRemoveFunction : public BrowsingDataRemoverFunction { @@ -134,7 +134,7 @@ class BrowsingDataRemoveFunction : public BrowsingDataRemoverFunction { virtual ~BrowsingDataRemoveFunction() {} // BrowsingDataRemoverFunction: - virtual int GetRemovalMask() OVERRIDE; + virtual int GetRemovalMask() override; }; class BrowsingDataRemoveCacheFunction : public BrowsingDataRemoverFunction { @@ -146,7 +146,7 @@ class BrowsingDataRemoveCacheFunction : public BrowsingDataRemoverFunction { virtual ~BrowsingDataRemoveCacheFunction() {} // BrowsingDataRemoverFunction: - virtual int GetRemovalMask() OVERRIDE; + virtual int GetRemovalMask() override; }; class BrowsingDataRemoveCookiesFunction : public BrowsingDataRemoverFunction { @@ -158,7 +158,7 @@ class BrowsingDataRemoveCookiesFunction : public BrowsingDataRemoverFunction { virtual ~BrowsingDataRemoveCookiesFunction() {} // BrowsingDataRemoverFunction: - virtual int GetRemovalMask() OVERRIDE; + virtual int GetRemovalMask() override; }; class BrowsingDataRemoveDownloadsFunction : public BrowsingDataRemoverFunction { @@ -170,7 +170,7 @@ class BrowsingDataRemoveDownloadsFunction : public BrowsingDataRemoverFunction { virtual ~BrowsingDataRemoveDownloadsFunction() {} // BrowsingDataRemoverFunction: - virtual int GetRemovalMask() OVERRIDE; + virtual int GetRemovalMask() override; }; class BrowsingDataRemoveFileSystemsFunction @@ -183,7 +183,7 @@ class BrowsingDataRemoveFileSystemsFunction virtual ~BrowsingDataRemoveFileSystemsFunction() {} // BrowsingDataRemoverFunction: - virtual int GetRemovalMask() OVERRIDE; + virtual int GetRemovalMask() override; }; class BrowsingDataRemoveFormDataFunction : public BrowsingDataRemoverFunction { @@ -195,7 +195,7 @@ class BrowsingDataRemoveFormDataFunction : public BrowsingDataRemoverFunction { virtual ~BrowsingDataRemoveFormDataFunction() {} // BrowsingDataRemoverFunction: - virtual int GetRemovalMask() OVERRIDE; + virtual int GetRemovalMask() override; }; class BrowsingDataRemoveHistoryFunction : public BrowsingDataRemoverFunction { @@ -207,7 +207,7 @@ class BrowsingDataRemoveHistoryFunction : public BrowsingDataRemoverFunction { virtual ~BrowsingDataRemoveHistoryFunction() {} // BrowsingDataRemoverFunction: - virtual int GetRemovalMask() OVERRIDE; + virtual int GetRemovalMask() override; }; class BrowsingDataRemoveIndexedDBFunction : public BrowsingDataRemoverFunction { @@ -219,7 +219,7 @@ class BrowsingDataRemoveIndexedDBFunction : public BrowsingDataRemoverFunction { virtual ~BrowsingDataRemoveIndexedDBFunction() {} // BrowsingDataRemoverFunction: - virtual int GetRemovalMask() OVERRIDE; + virtual int GetRemovalMask() override; }; class BrowsingDataRemoveLocalStorageFunction @@ -232,7 +232,7 @@ class BrowsingDataRemoveLocalStorageFunction virtual ~BrowsingDataRemoveLocalStorageFunction() {} // BrowsingDataRemoverFunction: - virtual int GetRemovalMask() OVERRIDE; + virtual int GetRemovalMask() override; }; class BrowsingDataRemovePluginDataFunction @@ -245,7 +245,7 @@ class BrowsingDataRemovePluginDataFunction virtual ~BrowsingDataRemovePluginDataFunction() {} // BrowsingDataRemoverFunction: - virtual int GetRemovalMask() OVERRIDE; + virtual int GetRemovalMask() override; }; class BrowsingDataRemovePasswordsFunction : public BrowsingDataRemoverFunction { @@ -257,7 +257,7 @@ class BrowsingDataRemovePasswordsFunction : public BrowsingDataRemoverFunction { virtual ~BrowsingDataRemovePasswordsFunction() {} // BrowsingDataRemoverFunction: - virtual int GetRemovalMask() OVERRIDE; + virtual int GetRemovalMask() override; }; class BrowsingDataRemoveServiceWorkersFunction @@ -270,7 +270,7 @@ class BrowsingDataRemoveServiceWorkersFunction virtual ~BrowsingDataRemoveServiceWorkersFunction() {} // BrowsingDataRemoverFunction: - virtual int GetRemovalMask() OVERRIDE; + virtual int GetRemovalMask() override; }; class BrowsingDataRemoveWebSQLFunction : public BrowsingDataRemoverFunction { @@ -282,7 +282,7 @@ class BrowsingDataRemoveWebSQLFunction : public BrowsingDataRemoverFunction { virtual ~BrowsingDataRemoveWebSQLFunction() {} // BrowsingDataRemoverFunction: - virtual int GetRemovalMask() OVERRIDE; + virtual int GetRemovalMask() override; }; #endif // CHROME_BROWSER_EXTENSIONS_API_BROWSING_DATA_BROWSING_DATA_API_H_ diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc index 5d017ea..88c8468 100644 --- a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc +++ b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc @@ -58,7 +58,7 @@ class ExtensionBrowsingDataTest : public InProcessBrowserTest, } protected: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { called_with_details_.reset(new BrowsingDataRemover::NotificationDetails()); registrar_.Add(this, chrome::NOTIFICATION_BROWSING_DATA_REMOVED, content::Source<Profile>(browser()->profile())); @@ -67,7 +67,7 @@ class ExtensionBrowsingDataTest : public InProcessBrowserTest, // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { DCHECK_EQ(type, chrome::NOTIFICATION_BROWSING_DATA_REMOVED); // We're not taking ownership of the details object, but storing a copy of diff --git a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc index d546d2a..7c838f7 100644 --- a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc +++ b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc @@ -37,7 +37,7 @@ namespace extensions { class CastStreamingApiTest : public ExtensionApiTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( extensions::switches::kWhitelistedExtensionID, @@ -155,7 +155,7 @@ class TestPatternReceiver : public media::cast::InProcessReceiver { // Invoked by InProcessReceiver for each received audio frame. virtual void OnAudioFrame(scoped_ptr<media::AudioBus> audio_frame, const base::TimeTicks& playout_time, - bool is_continuous) OVERRIDE { + bool is_continuous) override { DCHECK(cast_env()->CurrentlyOn(media::cast::CastEnvironment::MAIN)); if (audio_frame->frames() <= 0) { @@ -194,7 +194,7 @@ class TestPatternReceiver : public media::cast::InProcessReceiver { virtual void OnVideoFrame(const scoped_refptr<media::VideoFrame>& video_frame, const base::TimeTicks& playout_time, - bool is_continuous) OVERRIDE { + bool is_continuous) override { DCHECK(cast_env()->CurrentlyOn(media::cast::CastEnvironment::MAIN)); CHECK(video_frame->format() == media::VideoFrame::YV12 || @@ -316,12 +316,12 @@ class TestPatternReceiver : public media::cast::InProcessReceiver { } // namespace class CastStreamingApiTestWithPixelOutput : public CastStreamingApiTest { - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EnablePixelOutput(); CastStreamingApiTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitchASCII(::switches::kWindowSize, "128,128"); CastStreamingApiTest::SetUpCommandLine(command_line); } diff --git a/chrome/browser/extensions/api/cast_streaming/performance_test.cc b/chrome/browser/extensions/api/cast_streaming/performance_test.cc index 07b3f5d..8234ede 100644 --- a/chrome/browser/extensions/api/cast_streaming/performance_test.cc +++ b/chrome/browser/extensions/api/cast_streaming/performance_test.cc @@ -81,7 +81,7 @@ class SkewedTickClock : public base::DefaultTickClock { public: explicit SkewedTickClock(const base::TimeDelta& delta) : delta_(delta) { } - virtual base::TimeTicks NowTicks() OVERRIDE { + virtual base::TimeTicks NowTicks() override { return DefaultTickClock::NowTicks() + delta_; } private: @@ -241,7 +241,7 @@ class TestPatternReceiver : public media::cast::InProcessReceiver { // Invoked by InProcessReceiver for each received audio frame. virtual void OnAudioFrame(scoped_ptr<media::AudioBus> audio_frame, const base::TimeTicks& playout_time, - bool is_continuous) OVERRIDE { + bool is_continuous) override { CHECK(cast_env()->CurrentlyOn(media::cast::CastEnvironment::MAIN)); if (audio_frame->frames() <= 0) { @@ -262,7 +262,7 @@ class TestPatternReceiver : public media::cast::InProcessReceiver { virtual void OnVideoFrame(const scoped_refptr<media::VideoFrame>& video_frame, const base::TimeTicks& render_time, - bool is_continuous) OVERRIDE { + bool is_continuous) override { CHECK(cast_env()->CurrentlyOn(media::cast::CastEnvironment::MAIN)); TRACE_EVENT_INSTANT1( @@ -355,12 +355,12 @@ class CastV2PerformanceTest return endpoint; } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EnablePixelOutput(); ExtensionApiTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Some of the tests may launch http requests through JSON or AJAX // which causes a security error (cross domain request) when the page // is loaded from the local file system ( file:// ). The following switch diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.h b/chrome/browser/extensions/api/chrome_extensions_api_client.h index 254f727..925f089 100644 --- a/chrome/browser/extensions/api/chrome_extensions_api_client.h +++ b/chrome/browser/extensions/api/chrome_extensions_api_client.h @@ -22,23 +22,23 @@ class ChromeExtensionsAPIClient : public ExtensionsAPIClient { const scoped_refptr<SettingsStorageFactory>& factory, const scoped_refptr<ObserverListThreadSafe<SettingsObserver> >& observers, std::map<settings_namespace::Namespace, ValueStoreCache*>* caches) - OVERRIDE; - virtual AppViewGuestDelegate* CreateAppViewGuestDelegate() const OVERRIDE; + override; + virtual AppViewGuestDelegate* CreateAppViewGuestDelegate() const override; virtual ExtensionOptionsGuestDelegate* CreateExtensionOptionsGuestDelegate( - ExtensionOptionsGuest* guest) const OVERRIDE; + ExtensionOptionsGuest* guest) const override; virtual scoped_ptr<MimeHandlerViewGuestDelegate> CreateMimeHandlerViewGuestDelegate( - MimeHandlerViewGuest* guest) const OVERRIDE; + MimeHandlerViewGuest* guest) const override; virtual WebViewGuestDelegate* CreateWebViewGuestDelegate( - WebViewGuest* web_view_guest) const OVERRIDE; + WebViewGuest* web_view_guest) const override; virtual WebViewPermissionHelperDelegate* CreateWebViewPermissionHelperDelegate( - WebViewPermissionHelper* web_view_permission_helper) const OVERRIDE; + WebViewPermissionHelper* web_view_permission_helper) const override; virtual WebRequestEventRouterDelegate* CreateWebRequestEventRouterDelegate() - const OVERRIDE; + const override; virtual scoped_refptr<ContentRulesRegistry> CreateContentRulesRegistry( content::BrowserContext* browser_context, - RulesCacheDelegate* cache_delegate) const OVERRIDE; + RulesCacheDelegate* cache_delegate) const override; private: DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsAPIClient); diff --git a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h index 4585014..d5aa3c1 100644 --- a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h +++ b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h @@ -58,7 +58,7 @@ class CloudPrintPrivateSetupConnectorFunction virtual ~CloudPrintPrivateSetupConnectorFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class CloudPrintPrivateGetHostNameFunction @@ -73,7 +73,7 @@ class CloudPrintPrivateGetHostNameFunction virtual ~CloudPrintPrivateGetHostNameFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class CloudPrintPrivateGetPrintersFunction @@ -91,7 +91,7 @@ class CloudPrintPrivateGetPrintersFunction void SendResults(const std::vector<std::string>& printers); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class CloudPrintPrivateGetClientIdFunction @@ -106,7 +106,7 @@ class CloudPrintPrivateGetClientIdFunction virtual ~CloudPrintPrivateGetClientIdFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc index 42d9377..e9a5cd6 100644 --- a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc +++ b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc @@ -23,7 +23,7 @@ using ::testing::_; // A base class for tests below. class ExtensionCloudPrintPrivateApiTest : public ExtensionApiTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( switches::kCloudPrintURL, @@ -31,7 +31,7 @@ class ExtensionCloudPrintPrivateApiTest : public ExtensionApiTest { "cloud_print_private"); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { // Start up the test server and get us ready for calling the install // API functions. host_resolver()->AddRule("www.cloudprintapp.com", "127.0.0.1"); diff --git a/chrome/browser/extensions/api/command_line_private/command_line_private_api.h b/chrome/browser/extensions/api/command_line_private/command_line_private_api.h index bca3098..ceed07c 100644 --- a/chrome/browser/extensions/api/command_line_private/command_line_private_api.h +++ b/chrome/browser/extensions/api/command_line_private/command_line_private_api.h @@ -16,7 +16,7 @@ class CommandLinePrivateHasSwitchFunction : public SyncExtensionFunction { virtual ~CommandLinePrivateHasSwitchFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/command_line_private/command_line_private_apitest.cc b/chrome/browser/extensions/api/command_line_private/command_line_private_apitest.cc index ec14fd3..29bfa5a 100644 --- a/chrome/browser/extensions/api/command_line_private/command_line_private_apitest.cc +++ b/chrome/browser/extensions/api/command_line_private/command_line_private_apitest.cc @@ -12,7 +12,7 @@ const char kTestCommandLineSwitch[] = "command-line-private-api-test-foo"; } // namespace class CommandLinePrivateApiTest : public ExtensionApiTest { - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(base::CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitch(kTestCommandLineSwitch); } diff --git a/chrome/browser/extensions/api/commands/command_service.h b/chrome/browser/extensions/api/commands/command_service.h index 1304f9a..7f39b7d 100644 --- a/chrome/browser/extensions/api/commands/command_service.h +++ b/chrome/browser/extensions/api/commands/command_service.h @@ -184,11 +184,11 @@ class CommandService : public BrowserContextKeyedAPI, const Extension* extension, bool is_update, bool from_ephemeral, - const std::string& old_name) OVERRIDE; + const std::string& old_name) override; virtual void OnExtensionUninstalled( content::BrowserContext* browser_context, const Extension* extension, - extensions::UninstallReason reason) OVERRIDE; + extensions::UninstallReason reason) override; // Updates keybindings for a given |extension|'s page action, browser action // and named commands. Assigns new keybindings and removes relinquished diff --git a/chrome/browser/extensions/api/commands/commands.h b/chrome/browser/extensions/api/commands/commands.h index 0096e93..423049a 100644 --- a/chrome/browser/extensions/api/commands/commands.h +++ b/chrome/browser/extensions/api/commands/commands.h @@ -9,7 +9,7 @@ class GetAllCommandsFunction : public ChromeSyncExtensionFunction { virtual ~GetAllCommandsFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("commands.getAll", COMMANDS_GETALL) }; diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.h b/chrome/browser/extensions/api/content_settings/content_settings_api.h index a138cf3..fd904a6 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_api.h +++ b/chrome/browser/extensions/api/content_settings/content_settings_api.h @@ -24,7 +24,7 @@ class ContentSettingsContentSettingClearFunction virtual ~ContentSettingsContentSettingClearFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ContentSettingsContentSettingGetFunction @@ -36,7 +36,7 @@ class ContentSettingsContentSettingGetFunction virtual ~ContentSettingsContentSettingGetFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ContentSettingsContentSettingSetFunction @@ -48,7 +48,7 @@ class ContentSettingsContentSettingSetFunction virtual ~ContentSettingsContentSettingSetFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ContentSettingsContentSettingGetResourceIdentifiersFunction @@ -61,7 +61,7 @@ class ContentSettingsContentSettingGetResourceIdentifiersFunction virtual ~ContentSettingsContentSettingGetResourceIdentifiersFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: FRIEND_TEST_ALL_PREFIXES(ExtensionApiTest, diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc index acafd99..fe33840 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc @@ -35,12 +35,12 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest { public: ExtensionContentSettingsApiTest() : profile_(NULL) {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kDisablePluginsDiscovery); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); // The browser might get closed later (and therefore be destroyed), so we @@ -53,7 +53,7 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest { g_browser_process->AddRefModule(); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { // ReleaseBrowserProcessModule() needs to be called in a message loop, so we // post a task to do it, then run the message loop. base::MessageLoop::current()->PostTask( diff --git a/chrome/browser/extensions/api/content_settings/content_settings_service.h b/chrome/browser/extensions/api/content_settings/content_settings_service.h index 08a30dc..4534dfc 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_service.h +++ b/chrome/browser/extensions/api/content_settings/content_settings_service.h @@ -36,13 +36,13 @@ class ContentSettingsService : public BrowserContextKeyedAPI, // ExtensionPrefsObserver implementation. virtual void OnExtensionRegistered(const std::string& extension_id, const base::Time& install_time, - bool is_enabled) OVERRIDE; + bool is_enabled) override; virtual void OnExtensionPrefsLoaded(const std::string& extension_id, - const ExtensionPrefs* prefs) OVERRIDE; + const ExtensionPrefs* prefs) override; virtual void OnExtensionPrefsDeleted(const std::string& extension_id) - OVERRIDE; + override; virtual void OnExtensionStateChanged(const std::string& extension_id, - bool state) OVERRIDE; + bool state) override; private: friend class BrowserContextKeyedAPIFactory<ContentSettingsService>; diff --git a/chrome/browser/extensions/api/context_menus/context_menus_api.h b/chrome/browser/extensions/api/context_menus/context_menus_api.h index d2097ff..a832c32 100644 --- a/chrome/browser/extensions/api/context_menus/context_menus_api.h +++ b/chrome/browser/extensions/api/context_menus/context_menus_api.h @@ -17,7 +17,7 @@ class ContextMenusCreateFunction : public ChromeSyncExtensionFunction { virtual ~ContextMenusCreateFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ContextMenusUpdateFunction : public ChromeSyncExtensionFunction { @@ -28,7 +28,7 @@ class ContextMenusUpdateFunction : public ChromeSyncExtensionFunction { virtual ~ContextMenusUpdateFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ContextMenusRemoveFunction : public ChromeSyncExtensionFunction { @@ -39,7 +39,7 @@ class ContextMenusRemoveFunction : public ChromeSyncExtensionFunction { virtual ~ContextMenusRemoveFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ContextMenusRemoveAllFunction : public ChromeSyncExtensionFunction { @@ -50,7 +50,7 @@ class ContextMenusRemoveAllFunction : public ChromeSyncExtensionFunction { virtual ~ContextMenusRemoveAllFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/cookies/cookies_api.h b/chrome/browser/extensions/api/cookies/cookies_api.h index a7a0876..41f33f3 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.h +++ b/chrome/browser/extensions/api/cookies/cookies_api.h @@ -40,7 +40,7 @@ class CookiesEventRouter : 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; // Handler for the COOKIE_CHANGED event. The method takes the details of such // an event and constructs a suitable JSON formatted extension event from it. @@ -71,7 +71,7 @@ class CookiesGetFunction : public ChromeAsyncExtensionFunction { virtual ~CookiesGetFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void GetCookieOnIOThread(); @@ -94,7 +94,7 @@ class CookiesGetAllFunction : public ChromeAsyncExtensionFunction { virtual ~CookiesGetAllFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void GetAllCookiesOnIOThread(); @@ -115,7 +115,7 @@ class CookiesSetFunction : public ChromeAsyncExtensionFunction { protected: virtual ~CookiesSetFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void SetCookieOnIOThread(); @@ -140,7 +140,7 @@ class CookiesRemoveFunction : public ChromeAsyncExtensionFunction { virtual ~CookiesRemoveFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void RemoveCookieOnIOThread(); @@ -162,7 +162,7 @@ class CookiesGetAllCookieStoresFunction : public ChromeSyncExtensionFunction { virtual ~CookiesGetAllCookieStoresFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class CookiesAPI : public BrowserContextKeyedAPI, @@ -172,14 +172,14 @@ class CookiesAPI : public BrowserContextKeyedAPI, virtual ~CookiesAPI(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<CookiesAPI>* GetFactoryInstance(); // EventRouter::Observer implementation. virtual void OnListenerAdded(const extensions::EventListenerInfo& details) - OVERRIDE; + override; private: friend class BrowserContextKeyedAPIFactory<CookiesAPI>; diff --git a/chrome/browser/extensions/api/copresence/copresence_api.h b/chrome/browser/extensions/api/copresence/copresence_api.h index 83fb5db..5776fd7 100644 --- a/chrome/browser/extensions/api/copresence/copresence_api.h +++ b/chrome/browser/extensions/api/copresence/copresence_api.h @@ -31,7 +31,7 @@ class CopresenceService : public BrowserContextKeyedAPI, virtual ~CopresenceService(); // BrowserContextKeyedAPI implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // These accessors will always return an object (except during shutdown). // If the object doesn't exist, they will create one first. @@ -59,11 +59,11 @@ class CopresenceService : public BrowserContextKeyedAPI, virtual void HandleMessages( const std::string& app_id, const std::string& subscription_id, - const std::vector<copresence::Message>& message) OVERRIDE; - virtual net::URLRequestContextGetter* GetRequestContext() const OVERRIDE; - virtual const std::string GetPlatformVersionString() const OVERRIDE; - virtual const std::string GetAPIKey() const OVERRIDE; - virtual copresence::WhispernetClient* GetWhispernetClient() OVERRIDE; + const std::vector<copresence::Message>& message) override; + virtual net::URLRequestContextGetter* GetRequestContext() const override; + virtual const std::string GetPlatformVersionString() const override; + virtual const std::string GetAPIKey() const override; + virtual copresence::WhispernetClient* GetWhispernetClient() override; // BrowserContextKeyedAPI implementation. static const char* service_name() { return "CopresenceService"; } @@ -90,7 +90,7 @@ class CopresenceExecuteFunction : public ChromeUIThreadExtensionFunction { protected: virtual ~CopresenceExecuteFunction() {} - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; private: void SendResult(copresence::CopresenceStatus status); @@ -102,7 +102,7 @@ class CopresenceSetApiKeyFunction : public ChromeUIThreadExtensionFunction { protected: virtual ~CopresenceSetApiKeyFunction() {} - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc b/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc index f932306..95e8070 100644 --- a/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc +++ b/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc @@ -76,7 +76,7 @@ class MockCopresenceManager : public CopresenceManager { virtual void ExecuteReportRequest( ReportRequest request, const std::string& app_id, - const copresence::StatusCallback& status_callback) OVERRIDE { + const copresence::StatusCallback& status_callback) override { request_ = request; app_id_ = app_id; status_callback.Run(copresence::SUCCESS); @@ -93,7 +93,7 @@ class CopresenceApiUnittest : public ExtensionApiUnittest { CopresenceApiUnittest() {} virtual ~CopresenceApiUnittest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ExtensionApiUnittest::SetUp(); CopresenceService* service = diff --git a/chrome/browser/extensions/api/copresence_private/copresence_private_api.h b/chrome/browser/extensions/api/copresence_private/copresence_private_api.h index f6a7dbc..360734d 100644 --- a/chrome/browser/extensions/api/copresence_private/copresence_private_api.h +++ b/chrome/browser/extensions/api/copresence_private/copresence_private_api.h @@ -26,7 +26,7 @@ class CopresencePrivateSendFoundFunction : public CopresencePrivateFunction { protected: virtual ~CopresencePrivateSendFoundFunction() {} - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; class CopresencePrivateSendSamplesFunction : public CopresencePrivateFunction { @@ -36,7 +36,7 @@ class CopresencePrivateSendSamplesFunction : public CopresencePrivateFunction { protected: virtual ~CopresencePrivateSendSamplesFunction() {} - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; class CopresencePrivateSendDetectFunction : public CopresencePrivateFunction { @@ -46,7 +46,7 @@ class CopresencePrivateSendDetectFunction : public CopresencePrivateFunction { protected: virtual ~CopresencePrivateSendDetectFunction() {} - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; class CopresencePrivateSendInitializedFunction @@ -57,7 +57,7 @@ class CopresencePrivateSendInitializedFunction protected: virtual ~CopresencePrivateSendInitializedFunction() {} - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc index 8b2b40c..bd1489e 100644 --- a/chrome/browser/extensions/api/debugger/debugger_api.cc +++ b/chrome/browser/extensions/api/debugger/debugger_api.cc @@ -99,10 +99,10 @@ class ExtensionDevToolsClientHost : public content::DevToolsAgentHostClient, // DevToolsAgentHostClient interface. virtual void AgentHostClosed( DevToolsAgentHost* agent_host, - bool replaced_with_another_client) OVERRIDE; + bool replaced_with_another_client) override; virtual void DispatchProtocolMessage( DevToolsAgentHost* agent_host, - const std::string& message) OVERRIDE; + const std::string& message) override; private: void SendDetachedEvent(); @@ -110,13 +110,13 @@ class ExtensionDevToolsClientHost : public content::DevToolsAgentHostClient, // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // ExtensionRegistryObserver implementation. virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; Profile* profile_; scoped_refptr<DevToolsAgentHost> agent_host_; @@ -174,13 +174,13 @@ class ExtensionDevToolsInfoBarDelegate : public ConfirmInfoBarDelegate { virtual ~ExtensionDevToolsInfoBarDelegate(); // ConfirmInfoBarDelegate: - virtual void InfoBarDismissed() OVERRIDE; - virtual Type GetInfoBarType() const OVERRIDE; + virtual void InfoBarDismissed() override; + virtual Type GetInfoBarType() const override; virtual bool ShouldExpireInternal( - const NavigationDetails& details) const OVERRIDE; - virtual base::string16 GetMessageText() const OVERRIDE; - virtual int GetButtons() const OVERRIDE; - virtual bool Cancel() OVERRIDE; + const NavigationDetails& details) const override; + virtual base::string16 GetMessageText() const override; + virtual int GetButtons() const override; + virtual bool Cancel() override; std::string client_name_; ExtensionDevToolsClientHost* client_host_; diff --git a/chrome/browser/extensions/api/debugger/debugger_api.h b/chrome/browser/extensions/api/debugger/debugger_api.h index 52120c8..d1d907c 100644 --- a/chrome/browser/extensions/api/debugger/debugger_api.h +++ b/chrome/browser/extensions/api/debugger/debugger_api.h @@ -58,7 +58,7 @@ class DebuggerAttachFunction : public DebuggerFunction { virtual ~DebuggerAttachFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; // Implements the debugger.detach() extension function. @@ -72,7 +72,7 @@ class DebuggerDetachFunction : public DebuggerFunction { virtual ~DebuggerDetachFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; // Implements the debugger.sendCommand() extension function. @@ -87,7 +87,7 @@ class DebuggerSendCommandFunction : public DebuggerFunction { virtual ~DebuggerSendCommandFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; // Implements the debugger.getTargets() extension function. @@ -101,7 +101,7 @@ class DebuggerGetTargetsFunction : public DebuggerFunction { virtual ~DebuggerGetTargetsFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void SendTargetList(const std::vector<DevToolsTargetImpl*>& target_list); diff --git a/chrome/browser/extensions/api/debugger/debugger_apitest.cc b/chrome/browser/extensions/api/debugger/debugger_apitest.cc index 7253776..04ce863 100644 --- a/chrome/browser/extensions/api/debugger/debugger_apitest.cc +++ b/chrome/browser/extensions/api/debugger/debugger_apitest.cc @@ -29,8 +29,8 @@ class DebuggerApiTest : public ExtensionApiTest { protected: virtual ~DebuggerApiTest() {} - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; + virtual void SetUpCommandLine(base::CommandLine* command_line) override; + virtual void SetUpOnMainThread() override; // Run the attach function. If |expected_error| is not empty, then the // function should fail with the error. Otherwise, the function is expected diff --git a/chrome/browser/extensions/api/debugger/debugger_extension_apitest.cc b/chrome/browser/extensions/api/debugger/debugger_extension_apitest.cc index 2829a31..bb29baf 100644 --- a/chrome/browser/extensions/api/debugger/debugger_extension_apitest.cc +++ b/chrome/browser/extensions/api/debugger/debugger_extension_apitest.cc @@ -9,7 +9,7 @@ class ExtensionApiTestWithSwitch : public ExtensionApiTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kSilentDebuggerExtensionAPI); command_line->AppendSwitch(extensions::switches::kExtensionsOnChromeURLs); diff --git a/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc b/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc index b990635..b2ff97e 100644 --- a/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc +++ b/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc @@ -43,7 +43,7 @@ class RulesRegistryServiceTest : public testing::Test { virtual ~RulesRegistryServiceTest() {} - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Make sure that deletion traits of all registries are executed. message_loop_.RunUntilIdle(); } diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h index ef9d985..a792ce4 100644 --- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h +++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h @@ -72,28 +72,28 @@ class ChromeContentRulesRegistry : public ContentRulesRegistry, // page navigation, for now) from the renderer. virtual void Apply( content::WebContents* contents, - const std::vector<std::string>& matching_css_selectors) OVERRIDE; + const std::vector<std::string>& matching_css_selectors) override; // Applies all content rules given that a tab was just navigated. virtual void DidNavigateMainFrame( content::WebContents* tab, const content::LoadCommittedDetails& details, - const content::FrameNavigateParams& params) OVERRIDE; + const content::FrameNavigateParams& params) override; // Implementation of RulesRegistry: virtual std::string AddRulesImpl( const std::string& extension_id, - const std::vector<linked_ptr<RulesRegistry::Rule> >& rules) OVERRIDE; + const std::vector<linked_ptr<RulesRegistry::Rule> >& rules) override; virtual std::string RemoveRulesImpl( const std::string& extension_id, - const std::vector<std::string>& rule_identifiers) OVERRIDE; + const std::vector<std::string>& rule_identifiers) override; virtual std::string RemoveAllRulesImpl( - const std::string& extension_id) OVERRIDE; + const std::string& extension_id) override; // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Returns true if this object retains no allocated data. Only for debugging. bool IsEmpty() const; diff --git a/chrome/browser/extensions/api/declarative_content/content_action.cc b/chrome/browser/extensions/api/declarative_content/content_action.cc index 30a7675..154af37 100644 --- a/chrome/browser/extensions/api/declarative_content/content_action.cc +++ b/chrome/browser/extensions/api/declarative_content/content_action.cc @@ -74,10 +74,10 @@ class ShowPageAction : public ContentAction { } // Implementation of ContentAction: - virtual Type GetType() const OVERRIDE { return ACTION_SHOW_PAGE_ACTION; } + virtual Type GetType() const override { return ACTION_SHOW_PAGE_ACTION; } virtual void Apply(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE { + ApplyInfo* apply_info) const override { ExtensionAction* action = GetPageAction(apply_info->browser_context, extension_id); action->DeclarativeShow(ExtensionTabUtil::GetTabId(apply_info->tab)); @@ -87,10 +87,10 @@ class ShowPageAction : public ContentAction { // The page action is already showing, so nothing needs to be done here. virtual void Reapply(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE {} + ApplyInfo* apply_info) const override {} virtual void Revert(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE { + ApplyInfo* apply_info) const override { if (ExtensionAction* action = GetPageAction(apply_info->browser_context, extension_id)) { action->UndoDeclarativeShow(ExtensionTabUtil::GetTabId(apply_info->tab)); @@ -130,10 +130,10 @@ class SetIcon : public ContentAction { bool* bad_message); // Implementation of ContentAction: - virtual Type GetType() const OVERRIDE { return ACTION_SET_ICON; } + virtual Type GetType() const override { return ACTION_SET_ICON; } virtual void Apply(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE { + ApplyInfo* apply_info) const override { Profile* profile = Profile::FromBrowserContext(apply_info->browser_context); ExtensionAction* action = GetExtensionAction(profile, extension_id); if (action) { @@ -147,11 +147,11 @@ class SetIcon : public ContentAction { virtual void Reapply(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE {} + ApplyInfo* apply_info) const override {} virtual void Revert(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE { + ApplyInfo* apply_info) const override { Profile* profile = Profile::FromBrowserContext(apply_info->browser_context); ExtensionAction* action = GetExtensionAction(profile, extension_id); if (action) { diff --git a/chrome/browser/extensions/api/declarative_content/content_action.h b/chrome/browser/extensions/api/declarative_content/content_action.h index a8137cb..b10412d 100644 --- a/chrome/browser/extensions/api/declarative_content/content_action.h +++ b/chrome/browser/extensions/api/declarative_content/content_action.h @@ -122,19 +122,19 @@ class RequestContentScript : public ContentAction { ScriptData* script_data); // Implementation of ContentAction: - virtual Type GetType() const OVERRIDE; + virtual Type GetType() const override; virtual void Apply(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE; + ApplyInfo* apply_info) const override; virtual void Reapply(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE; + ApplyInfo* apply_info) const override; virtual void Revert(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE; + ApplyInfo* apply_info) const override; private: void InitScript(const Extension* extension, const ScriptData& script_data); diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc index a87ae45..3c1e3d4 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc @@ -76,7 +76,7 @@ class WebRequestActionWithThreadsTest : public testing::Test { : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {} protected: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; // Creates a URL request for URL |url_string|, and applies the actions from // |action_set| as if they were triggered by the extension with diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc index 103149c..369e35f 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc @@ -72,7 +72,7 @@ class TestWebRequestRulesRegistry : public WebRequestRulesRegistry { protected: virtual ~TestWebRequestRulesRegistry() {} - virtual void ClearCacheOnNavigation() OVERRIDE { + virtual void ClearCacheOnNavigation() override { ++num_clear_cache_calls_; } @@ -88,9 +88,9 @@ class WebRequestRulesRegistryTest : public testing::Test { virtual ~WebRequestRulesRegistryTest() {} - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Make sure that deletion traits of all registries are executed. message_loop_.RunUntilIdle(); } diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h index 475edf9..a1ff2a2 100644 --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h @@ -49,10 +49,10 @@ class DesktopCaptureChooseDesktopMediaFunction virtual ~DesktopCaptureChooseDesktopMediaFunction(); // ExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // content::WebContentsObserver overrides. - virtual void WebContentsDestroyed() OVERRIDE; + virtual void WebContentsDestroyed() override; void OnPickerDialogResults(content::DesktopMediaID source); @@ -76,7 +76,7 @@ class DesktopCaptureCancelChooseDesktopMediaFunction virtual ~DesktopCaptureCancelChooseDesktopMediaFunction(); // ExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class DesktopCaptureRequestsRegistry { diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc index e2b9649..479c496 100644 --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc @@ -53,7 +53,7 @@ class FakeDesktopMediaPicker : public DesktopMediaPicker { const base::string16& app_name, const base::string16& target_name, scoped_ptr<DesktopMediaList> model, - const DoneCallback& done_callback) OVERRIDE { + const DoneCallback& done_callback) override { if (!expectation_->cancelled) { // Post a task to call the callback asynchronously. base::ThreadTaskRunnerHandle::Get()->PostTask( @@ -95,7 +95,7 @@ class FakeDesktopMediaPickerFactory : // DesktopCaptureChooseDesktopMediaFunction::PickerFactory interface. virtual scoped_ptr<DesktopMediaList> CreateModel( bool show_screens, - bool show_windows) OVERRIDE { + bool show_windows) override { EXPECT_LE(current_test_, tests_count_); if (current_test_ >= tests_count_) return scoped_ptr<DesktopMediaList>(); @@ -104,7 +104,7 @@ class FakeDesktopMediaPickerFactory : return scoped_ptr<DesktopMediaList>(new FakeDesktopMediaList()); } - virtual scoped_ptr<DesktopMediaPicker> CreatePicker() OVERRIDE { + virtual scoped_ptr<DesktopMediaPicker> CreatePicker() override { EXPECT_LE(current_test_, tests_count_); if (current_test_ >= tests_count_) return scoped_ptr<DesktopMediaPicker>(); diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h index e545a4c..9a6d08f 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.h +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h @@ -73,28 +73,28 @@ class DeveloperPrivateEventRouter : 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; // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; virtual void OnExtensionWillBeInstalled( content::BrowserContext* browser_context, const Extension* extension, bool is_update, bool from_ephemeral, - const std::string& old_name) OVERRIDE; + const std::string& old_name) override; virtual void OnExtensionUninstalled( content::BrowserContext* browser_context, const Extension* extension, - extensions::UninstallReason reason) OVERRIDE; + extensions::UninstallReason reason) override; // ErrorConsole::Observer implementation. - virtual void OnErrorAdded(const ExtensionError* error) OVERRIDE; + virtual void OnErrorAdded(const ExtensionError* error) override; content::NotificationRegistrar registrar_; @@ -135,11 +135,11 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI, } // KeyedService implementation - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // EventRouter::Observer implementation. - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; - virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; + virtual void OnListenerRemoved(const EventListenerInfo& details) override; private: friend class BrowserContextKeyedAPIFactory<DeveloperPrivateAPI>; @@ -174,7 +174,7 @@ class DeveloperPrivateAutoUpdateFunction : public ChromeSyncExtensionFunction { virtual ~DeveloperPrivateAutoUpdateFunction(); // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class DeveloperPrivateGetItemsInfoFunction @@ -187,7 +187,7 @@ class DeveloperPrivateGetItemsInfoFunction virtual ~DeveloperPrivateGetItemsInfoFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: scoped_ptr<developer::ItemInfo> CreateItemInfo(const Extension& item, @@ -227,7 +227,7 @@ class DeveloperPrivateInspectFunction : public ChromeSyncExtensionFunction { virtual ~DeveloperPrivateInspectFunction(); // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class DeveloperPrivateAllowFileAccessFunction @@ -240,7 +240,7 @@ class DeveloperPrivateAllowFileAccessFunction virtual ~DeveloperPrivateAllowFileAccessFunction(); // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class DeveloperPrivateAllowIncognitoFunction @@ -253,7 +253,7 @@ class DeveloperPrivateAllowIncognitoFunction virtual ~DeveloperPrivateAllowIncognitoFunction(); // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class DeveloperPrivateReloadFunction : public ChromeSyncExtensionFunction { @@ -265,7 +265,7 @@ class DeveloperPrivateReloadFunction : public ChromeSyncExtensionFunction { virtual ~DeveloperPrivateReloadFunction(); // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class DeveloperPrivateShowPermissionsDialogFunction @@ -280,11 +280,11 @@ class DeveloperPrivateShowPermissionsDialogFunction virtual ~DeveloperPrivateShowPermissionsDialogFunction(); // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; // Overridden from ExtensionInstallPrompt::Delegate - virtual void InstallUIProceed() OVERRIDE; - virtual void InstallUIAbort(bool user_initiated) OVERRIDE; + virtual void InstallUIProceed() override; + virtual void InstallUIAbort(bool user_initiated) override; scoped_ptr<ExtensionInstallPrompt> prompt_; std::string extension_id_; @@ -306,7 +306,7 @@ class DeveloperPrivateEnableFunction void OnRequirementsChecked(const std::string& extension_id, std::vector<std::string> requirements_errors); // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: scoped_ptr<RequirementsChecker> requirements_checker_; @@ -316,7 +316,7 @@ class DeveloperPrivateChooseEntryFunction : public ChromeAsyncExtensionFunction, public EntryPickerClient { protected: virtual ~DeveloperPrivateChooseEntryFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; bool ShowPicker(ui::SelectFileDialog::Type picker_type, const base::FilePath& last_directory, const base::string16& select_title, @@ -337,11 +337,11 @@ class DeveloperPrivateLoadUnpackedFunction protected: virtual ~DeveloperPrivateLoadUnpackedFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // EntryPickerCLient implementation. - virtual void FileSelected(const base::FilePath& path) OVERRIDE; - virtual void FileSelectionCanceled() OVERRIDE; + virtual void FileSelected(const base::FilePath& path) override; + virtual void FileSelectionCanceled() override; }; class DeveloperPrivateChoosePathFunction @@ -352,11 +352,11 @@ class DeveloperPrivateChoosePathFunction protected: virtual ~DeveloperPrivateChoosePathFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // EntryPickerClient functions. - virtual void FileSelected(const base::FilePath& path) OVERRIDE; - virtual void FileSelectionCanceled() OVERRIDE; + virtual void FileSelected(const base::FilePath& path) override; + virtual void FileSelectionCanceled() override; }; class DeveloperPrivatePackDirectoryFunction @@ -371,13 +371,13 @@ class DeveloperPrivatePackDirectoryFunction // ExtensionPackJob::Client implementation. virtual void OnPackSuccess(const base::FilePath& crx_file, - const base::FilePath& key_file) OVERRIDE; + const base::FilePath& key_file) override; virtual void OnPackFailure(const std::string& error, - ExtensionCreator::ErrorType error_type) OVERRIDE; + ExtensionCreator::ErrorType error_type) override; protected: virtual ~DeveloperPrivatePackDirectoryFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: scoped_refptr<PackExtensionJob> pack_job_; @@ -395,7 +395,7 @@ class DeveloperPrivateIsProfileManagedFunction virtual ~DeveloperPrivateIsProfileManagedFunction(); // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class DeveloperPrivateLoadDirectoryFunction @@ -410,7 +410,7 @@ class DeveloperPrivateLoadDirectoryFunction virtual ~DeveloperPrivateLoadDirectoryFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; bool LoadByFileSystemAPI(const storage::FileSystemURL& directory_url); @@ -466,7 +466,7 @@ class DeveloperPrivateRequestFileSourceFunction virtual ~DeveloperPrivateRequestFileSourceFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void LaunchCallback(const base::DictionaryValue& results); @@ -484,7 +484,7 @@ class DeveloperPrivateOpenDevToolsFunction virtual ~DeveloperPrivateOpenDevToolsFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; } // namespace api diff --git a/chrome/browser/extensions/api/developer_private/entry_picker.h b/chrome/browser/extensions/api/developer_private/entry_picker.h index 7dd4e4b..b5afbde 100644 --- a/chrome/browser/extensions/api/developer_private/entry_picker.h +++ b/chrome/browser/extensions/api/developer_private/entry_picker.h @@ -45,9 +45,9 @@ class EntryPicker : public ui::SelectFileDialog::Listener { // ui::SelectFileDialog::Listener implementation. virtual void FileSelected(const base::FilePath& path, int index, - void* params) OVERRIDE; + void* params) override; - virtual void FileSelectionCanceled(void* params) OVERRIDE; + virtual void FileSelectionCanceled(void* params) override; scoped_refptr<ui::SelectFileDialog> select_file_dialog_; EntryPickerClient* client_; diff --git a/chrome/browser/extensions/api/device_permissions_manager_unittest.cc b/chrome/browser/extensions/api/device_permissions_manager_unittest.cc index 3990933..89f7fac 100644 --- a/chrome/browser/extensions/api/device_permissions_manager_unittest.cc +++ b/chrome/browser/extensions/api/device_permissions_manager_unittest.cc @@ -37,7 +37,7 @@ class MockUsbDevice : public UsbDevice { MOCK_METHOD1(GetManufacturer, bool(base::string16*)); MOCK_METHOD1(GetProduct, bool(base::string16*)); - virtual bool GetSerialNumber(base::string16* serial_number) OVERRIDE { + virtual bool GetSerialNumber(base::string16* serial_number) override { if (serial_number_.empty()) { return false; } @@ -58,7 +58,7 @@ class MockUsbDevice : public UsbDevice { class DevicePermissionsManagerTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { testing::Test::SetUp(); env_.GetExtensionPrefs(); // Force creation before adding extensions. extension_ = env_.MakeExtension(*base::test::ParseJson( diff --git a/chrome/browser/extensions/api/diagnostics/diagnostics_api.h b/chrome/browser/extensions/api/diagnostics/diagnostics_api.h index e088f3c..c3c9682 100644 --- a/chrome/browser/extensions/api/diagnostics/diagnostics_api.h +++ b/chrome/browser/extensions/api/diagnostics/diagnostics_api.h @@ -37,10 +37,10 @@ class DiagnosticsSendPacketFunction : public AsyncApiFunction { virtual ~DiagnosticsSendPacketFunction(); // AsyncApiFunction: - virtual bool Prepare() OVERRIDE; + virtual bool Prepare() override; // This methods will be implemented differently on different platforms. - virtual void AsyncWorkStart() OVERRIDE; - virtual bool Respond() OVERRIDE; + virtual void AsyncWorkStart() override; + virtual bool Respond() override; private: void SendPingPacket(); diff --git a/chrome/browser/extensions/api/dial/dial_api.h b/chrome/browser/extensions/api/dial/dial_api.h index e1d982c..cc56b84 100644 --- a/chrome/browser/extensions/api/dial/dial_api.h +++ b/chrome/browser/extensions/api/dial/dial_api.h @@ -40,16 +40,16 @@ class DialAPI : public RefcountedBrowserContextKeyedService, virtual ~DialAPI(); // RefcountedBrowserContextKeyedService: - virtual void ShutdownOnUIThread() OVERRIDE; + virtual void ShutdownOnUIThread() override; // EventRouter::Observer: - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; - virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; + virtual void OnListenerRemoved(const EventListenerInfo& details) override; // DialRegistry::Observer: virtual void OnDialDeviceEvent( - const DialRegistry::DeviceList& devices) OVERRIDE; - virtual void OnDialError(DialRegistry::DialErrorCode type) OVERRIDE; + const DialRegistry::DeviceList& devices) override; + virtual void OnDialError(DialRegistry::DialErrorCode type) override; // Methods to notify the DialRegistry on the correct thread of new/removed // listeners. @@ -78,9 +78,9 @@ class DialDiscoverNowFunction : public AsyncApiFunction { virtual ~DialDiscoverNowFunction() {} // AsyncApiFunction: - virtual bool Prepare() OVERRIDE; - virtual void Work() OVERRIDE; - virtual bool Respond() OVERRIDE; + virtual bool Prepare() override; + virtual void Work() override; + virtual bool Respond() override; private: DECLARE_EXTENSION_FUNCTION("dial.discoverNow", DIAL_DISCOVERNOW) diff --git a/chrome/browser/extensions/api/dial/dial_api_factory.h b/chrome/browser/extensions/api/dial/dial_api_factory.h index 035ec6d..8d64203 100644 --- a/chrome/browser/extensions/api/dial/dial_api_factory.h +++ b/chrome/browser/extensions/api/dial/dial_api_factory.h @@ -27,9 +27,9 @@ class DialAPIFactory : public RefcountedBrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory: virtual scoped_refptr<RefcountedBrowserContextKeyedService> - BuildServiceInstanceFor(content::BrowserContext* profile) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + BuildServiceInstanceFor(content::BrowserContext* profile) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; DISALLOW_COPY_AND_ASSIGN(DialAPIFactory); }; diff --git a/chrome/browser/extensions/api/dial/dial_apitest.cc b/chrome/browser/extensions/api/dial/dial_apitest.cc index 62ab634..f2c0e75 100644 --- a/chrome/browser/extensions/api/dial/dial_apitest.cc +++ b/chrome/browser/extensions/api/dial/dial_apitest.cc @@ -25,7 +25,7 @@ class DialAPITest : public ExtensionApiTest { public: DialAPITest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( extensions::switches::kWhitelistedExtensionID, diff --git a/chrome/browser/extensions/api/dial/dial_registry.h b/chrome/browser/extensions/api/dial/dial_registry.h index d78f531..ac474c5e 100644 --- a/chrome/browser/extensions/api/dial/dial_registry.h +++ b/chrome/browser/extensions/api/dial/dial_registry.h @@ -88,16 +88,16 @@ class DialRegistry : public DialService::Observer, typedef std::map<std::string, linked_ptr<DialDeviceData> > DeviceByLabelMap; // DialService::Observer: - virtual void OnDiscoveryRequest(DialService* service) OVERRIDE; + virtual void OnDiscoveryRequest(DialService* service) override; virtual void OnDeviceDiscovered(DialService* service, - const DialDeviceData& device) OVERRIDE; - virtual void OnDiscoveryFinished(DialService* service) OVERRIDE; + const DialDeviceData& device) override; + virtual void OnDiscoveryFinished(DialService* service) override; virtual void OnError(DialService* service, - const DialService::DialServiceErrorCode& code) OVERRIDE; + const DialService::DialServiceErrorCode& code) override; // net::NetworkChangeObserver: virtual void OnNetworkChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; + net::NetworkChangeNotifier::ConnectionType type) override; // Starts and stops periodic discovery. Periodic discovery is done when there // are registered event listeners. diff --git a/chrome/browser/extensions/api/dial/dial_registry_unittest.cc b/chrome/browser/extensions/api/dial/dial_registry_unittest.cc index 15658b5..608cfe4 100644 --- a/chrome/browser/extensions/api/dial/dial_registry_unittest.cc +++ b/chrome/browser/extensions/api/dial/dial_registry_unittest.cc @@ -64,15 +64,15 @@ class MockDialRegistry : public DialRegistry { Time time_; protected: - virtual base::Time Now() const OVERRIDE { + virtual base::Time Now() const override { return time_; } - virtual DialService* CreateDialService() OVERRIDE { + virtual DialService* CreateDialService() override { return &mock_service_; } - virtual void ClearDialService() OVERRIDE { + virtual void ClearDialService() override { // Release the pointer but don't delete the object because the test owns it. CHECK_EQ(&mock_service_, dial_.release()); } diff --git a/chrome/browser/extensions/api/dial/dial_service.h b/chrome/browser/extensions/api/dial/dial_service.h index 82efb3e..3f84732 100644 --- a/chrome/browser/extensions/api/dial/dial_service.h +++ b/chrome/browser/extensions/api/dial/dial_service.h @@ -105,10 +105,10 @@ class DialServiceImpl : public DialService, virtual ~DialServiceImpl(); // DialService implementation - virtual bool Discover() OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual bool HasObserver(Observer* observer) OVERRIDE; + virtual bool Discover() override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual bool HasObserver(Observer* observer) override; private: // Represents a socket binding to a single network interface. diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index a98c89f..47f7fa5 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -302,7 +302,7 @@ class DownloadFileIconExtractorImpl : public DownloadFileIconExtractor { virtual bool ExtractIconURLForPath(const base::FilePath& path, float scale, IconLoader::IconSize icon_size, - IconURLCallback callback) OVERRIDE; + IconURLCallback callback) override; private: void OnIconLoadComplete( float scale, const IconURLCallback& callback, gfx::Image* icon); @@ -893,7 +893,7 @@ class ManagerDestructionObserver : public DownloadManager::Observer { manager_->RemoveObserver(this); } - virtual void ManagerGoingDown(DownloadManager* manager) OVERRIDE { + virtual void ManagerGoingDown(DownloadManager* manager) override { manager_file_existence_last_checked_->erase(manager); if (manager_file_existence_last_checked_->size() == 0) { delete manager_file_existence_last_checked_; diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/browser/extensions/api/downloads/downloads_api.h index aaf92d3..6f7fa73 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.h +++ b/chrome/browser/extensions/api/downloads/downloads_api.h @@ -94,7 +94,7 @@ class DownloadsDownloadFunction : public ChromeAsyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.download", DOWNLOADS_DOWNLOAD) DownloadsDownloadFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; protected: virtual ~DownloadsDownloadFunction(); @@ -113,7 +113,7 @@ class DownloadsSearchFunction : public ChromeSyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.search", DOWNLOADS_SEARCH) DownloadsSearchFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; protected: virtual ~DownloadsSearchFunction(); @@ -126,7 +126,7 @@ class DownloadsPauseFunction : public ChromeSyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.pause", DOWNLOADS_PAUSE) DownloadsPauseFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; protected: virtual ~DownloadsPauseFunction(); @@ -139,7 +139,7 @@ class DownloadsResumeFunction : public ChromeSyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.resume", DOWNLOADS_RESUME) DownloadsResumeFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; protected: virtual ~DownloadsResumeFunction(); @@ -152,7 +152,7 @@ class DownloadsCancelFunction : public ChromeSyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.cancel", DOWNLOADS_CANCEL) DownloadsCancelFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; protected: virtual ~DownloadsCancelFunction(); @@ -165,7 +165,7 @@ class DownloadsEraseFunction : public ChromeSyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.erase", DOWNLOADS_ERASE) DownloadsEraseFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; protected: virtual ~DownloadsEraseFunction(); @@ -178,7 +178,7 @@ class DownloadsRemoveFileFunction : public ChromeAsyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.removeFile", DOWNLOADS_REMOVEFILE) DownloadsRemoveFileFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; protected: virtual ~DownloadsRemoveFileFunction(); @@ -199,7 +199,7 @@ class DownloadsAcceptDangerFunction : public ChromeAsyncExtensionFunction { DECLARE_EXTENSION_FUNCTION("downloads.acceptDanger", DOWNLOADS_ACCEPTDANGER) DownloadsAcceptDangerFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; protected: virtual ~DownloadsAcceptDangerFunction(); @@ -217,7 +217,7 @@ class DownloadsShowFunction : public ChromeAsyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.show", DOWNLOADS_SHOW) DownloadsShowFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; protected: virtual ~DownloadsShowFunction(); @@ -231,7 +231,7 @@ class DownloadsShowDefaultFolderFunction : public ChromeAsyncExtensionFunction { DECLARE_EXTENSION_FUNCTION( "downloads.showDefaultFolder", DOWNLOADS_SHOWDEFAULTFOLDER) DownloadsShowDefaultFolderFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; protected: virtual ~DownloadsShowDefaultFolderFunction(); @@ -244,7 +244,7 @@ class DownloadsOpenFunction : public ChromeSyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.open", DOWNLOADS_OPEN) DownloadsOpenFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; protected: virtual ~DownloadsOpenFunction(); @@ -258,7 +258,7 @@ class DownloadsSetShelfEnabledFunction : public ChromeSyncExtensionFunction { DECLARE_EXTENSION_FUNCTION("downloads.setShelfEnabled", DOWNLOADS_SETSHELFENABLED) DownloadsSetShelfEnabledFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; protected: virtual ~DownloadsSetShelfEnabledFunction(); @@ -271,7 +271,7 @@ class DownloadsDragFunction : public ChromeAsyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.drag", DOWNLOADS_DRAG) DownloadsDragFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; protected: virtual ~DownloadsDragFunction(); @@ -284,7 +284,7 @@ class DownloadsGetFileIconFunction : public ChromeAsyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.getFileIcon", DOWNLOADS_GETFILEICON) DownloadsGetFileIconFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void SetIconExtractorForTesting(DownloadFileIconExtractor* extractor); protected: @@ -364,17 +364,17 @@ class ExtensionDownloadsEventRouter // AllDownloadItemNotifier::Observer. virtual void OnDownloadCreated( content::DownloadManager* manager, - content::DownloadItem* download_item) OVERRIDE; + content::DownloadItem* download_item) override; virtual void OnDownloadUpdated( content::DownloadManager* manager, - content::DownloadItem* download_item) OVERRIDE; + content::DownloadItem* download_item) override; virtual void OnDownloadRemoved( content::DownloadManager* manager, - content::DownloadItem* download_item) OVERRIDE; + content::DownloadItem* download_item) override; // extensions::EventRouter::Observer. virtual void OnListenerRemoved( - const extensions::EventListenerInfo& details) OVERRIDE; + const extensions::EventListenerInfo& details) override; // Used for testing. struct DownloadsNotificationSource { @@ -393,7 +393,7 @@ class ExtensionDownloadsEventRouter virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const extensions::Extension* extension, - extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE; + extensions::UnloadedExtensionInfo::Reason reason) override; Profile* profile_; AllDownloadItemNotifier notifier_; diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc index 45e7b49..ece234a 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc @@ -176,7 +176,7 @@ class DownloadsEventsListener : public content::NotificationObserver { virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { switch (type) { case extensions::NOTIFICATION_EXTENSION_DOWNLOADS_EVENT: { DownloadsNotificationSource* dns = @@ -312,7 +312,7 @@ class DownloadExtensionTest : public ExtensionApiTest { Browser* current_browser() { return current_browser_; } // InProcessBrowserTest - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, @@ -622,7 +622,7 @@ class MockIconExtractorImpl : public DownloadFileIconExtractor { virtual bool ExtractIconURLForPath(const base::FilePath& path, float scale, IconLoader::IconSize icon_size, - IconURLCallback callback) OVERRIDE { + IconURLCallback callback) override { EXPECT_STREQ(expected_path_.value().c_str(), path.value().c_str()); EXPECT_EQ(expected_icon_size_, icon_size); if (expected_path_ == path && @@ -761,7 +761,7 @@ class JustInProgressDownloadObserver virtual ~JustInProgressDownloadObserver() {} private: - virtual bool IsDownloadInFinalState(DownloadItem* item) OVERRIDE { + virtual bool IsDownloadInFinalState(DownloadItem* item) override { return item->GetState() == DownloadItem::IN_PROGRESS; } diff --git a/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.h b/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.h index 94fef49..36fbaf1 100644 --- a/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.h +++ b/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.h @@ -15,7 +15,7 @@ class DownloadsInternalDetermineFilenameFunction DECLARE_EXTENSION_FUNCTION("downloadsInternal.determineFilename", DOWNLOADSINTERNAL_DETERMINEFILENAME); DownloadsInternalDetermineFilenameFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; protected: virtual ~DownloadsInternalDetermineFilenameFunction(); diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h index a6be6ab..89b62f3 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h @@ -63,7 +63,7 @@ class EasyUnlockPrivateGetStringsFunction : public SyncExtensionFunction { virtual ~EasyUnlockPrivateGetStringsFunction(); // SyncExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.getStrings", @@ -80,7 +80,7 @@ class EasyUnlockPrivatePerformECDHKeyAgreementFunction protected: virtual ~EasyUnlockPrivatePerformECDHKeyAgreementFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnData(const std::string& secret_key); @@ -99,7 +99,7 @@ class EasyUnlockPrivateGenerateEcP256KeyPairFunction protected: virtual ~EasyUnlockPrivateGenerateEcP256KeyPairFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnData(const std::string& public_key, @@ -119,7 +119,7 @@ class EasyUnlockPrivateCreateSecureMessageFunction protected: virtual ~EasyUnlockPrivateCreateSecureMessageFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnData(const std::string& message); @@ -138,7 +138,7 @@ class EasyUnlockPrivateUnwrapSecureMessageFunction protected: virtual ~EasyUnlockPrivateUnwrapSecureMessageFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnData(const std::string& data); @@ -160,7 +160,7 @@ class EasyUnlockPrivateSeekBluetoothDeviceByAddressFunction virtual ~EasyUnlockPrivateSeekBluetoothDeviceByAddressFunction(); // AsyncExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Callbacks that are called when the seek operation succeeds or fails. void OnSeekSuccess(); @@ -183,7 +183,7 @@ class EasyUnlockPrivateConnectToBluetoothServiceInsecurelyFunction // BluetoothSocketAbstractConnectFunction: virtual void ConnectToService(device::BluetoothDevice* device, - const device::BluetoothUUID& uuid) OVERRIDE; + const device::BluetoothUUID& uuid) override; DISALLOW_COPY_AND_ASSIGN( EasyUnlockPrivateConnectToBluetoothServiceInsecurelyFunction); @@ -197,7 +197,7 @@ class EasyUnlockPrivateUpdateScreenlockStateFunction protected: virtual ~EasyUnlockPrivateUpdateScreenlockStateFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.updateScreenlockState", @@ -216,7 +216,7 @@ class EasyUnlockPrivateSetPermitAccessFunction : public SyncExtensionFunction { virtual ~EasyUnlockPrivateSetPermitAccessFunction(); // SyncExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateSetPermitAccessFunction); }; @@ -231,7 +231,7 @@ class EasyUnlockPrivateGetPermitAccessFunction : public SyncExtensionFunction { virtual ~EasyUnlockPrivateGetPermitAccessFunction(); // SyncExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateGetPermitAccessFunction); }; @@ -247,7 +247,7 @@ class EasyUnlockPrivateClearPermitAccessFunction virtual ~EasyUnlockPrivateClearPermitAccessFunction(); // SyncExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateClearPermitAccessFunction); }; @@ -262,7 +262,7 @@ class EasyUnlockPrivateSetRemoteDevicesFunction : public SyncExtensionFunction { virtual ~EasyUnlockPrivateSetRemoteDevicesFunction(); // SyncExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateSetRemoteDevicesFunction); }; @@ -277,7 +277,7 @@ class EasyUnlockPrivateGetRemoteDevicesFunction : public SyncExtensionFunction { virtual ~EasyUnlockPrivateGetRemoteDevicesFunction(); // SyncExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateGetRemoteDevicesFunction); }; @@ -293,7 +293,7 @@ class EasyUnlockPrivateGetSignInChallengeFunction : virtual ~EasyUnlockPrivateGetSignInChallengeFunction(); // SyncExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateGetSignInChallengeFunction); }; @@ -309,7 +309,7 @@ class EasyUnlockPrivateTrySignInSecretFunction : virtual ~EasyUnlockPrivateTrySignInSecretFunction(); // SyncExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateTrySignInSecretFunction); }; @@ -324,7 +324,7 @@ class EasyUnlockPrivateGetUserInfoFunction : public SyncExtensionFunction { virtual ~EasyUnlockPrivateGetUserInfoFunction(); // SyncExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateGetUserInfoFunction); }; diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc index 6a0b32a..512aea6 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc @@ -54,14 +54,14 @@ class EasyUnlockPrivateApiTest : public extensions::ExtensionApiUnittest { virtual ~EasyUnlockPrivateApiTest() {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { chromeos::DBusThreadManager::Initialize(); client_ = chromeos::DBusThreadManager::Get()->GetEasyUnlockClient(); extensions::ExtensionApiUnittest::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { extensions::ExtensionApiUnittest::TearDown(); chromeos::DBusThreadManager::Shutdown(); diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_chromeos.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_chromeos.cc index 8919924..fa805e4 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_chromeos.cc +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_chromeos.cc @@ -48,13 +48,13 @@ class EasyUnlockPrivateCryptoDelegateChromeOS virtual ~EasyUnlockPrivateCryptoDelegateChromeOS() {} - virtual void GenerateEcP256KeyPair(const KeyPairCallback& callback) OVERRIDE { + virtual void GenerateEcP256KeyPair(const KeyPairCallback& callback) override { dbus_client_->GenerateEcP256KeyPair(callback); } virtual void PerformECDHKeyAgreement( const easy_unlock_private::PerformECDHKeyAgreement::Params& params, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { dbus_client_->PerformECDHKeyAgreement( params.private_key, params.public_key, @@ -63,7 +63,7 @@ class EasyUnlockPrivateCryptoDelegateChromeOS virtual void CreateSecureMessage( const easy_unlock_private::CreateSecureMessage::Params& params, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { chromeos::EasyUnlockClient::CreateSecureMessageOptions options; options.key = params.key; if (params.options.associated_data) @@ -84,7 +84,7 @@ class EasyUnlockPrivateCryptoDelegateChromeOS virtual void UnwrapSecureMessage( const easy_unlock_private::UnwrapSecureMessage::Params& params, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { chromeos::EasyUnlockClient::UnwrapSecureMessageOptions options; options.key = params.key; if (params.options.associated_data) diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_stub.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_stub.cc index 1b77c11..126a5d9 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_stub.cc +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_stub.cc @@ -17,25 +17,25 @@ class EasyUnlockPrivateCryptoDelegateStub virtual ~EasyUnlockPrivateCryptoDelegateStub() {} - virtual void GenerateEcP256KeyPair(const KeyPairCallback& callback) OVERRIDE { + virtual void GenerateEcP256KeyPair(const KeyPairCallback& callback) override { callback.Run("", ""); } virtual void PerformECDHKeyAgreement( const easy_unlock_private::PerformECDHKeyAgreement::Params& params, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { callback.Run(""); } virtual void CreateSecureMessage( const easy_unlock_private::CreateSecureMessage::Params& params, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { callback.Run(""); } virtual void UnwrapSecureMessage( const easy_unlock_private::UnwrapSecureMessage::Params& params, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { callback.Run(""); } diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.h b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.h index dd3bf39..27e2e8d 100644 --- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.h +++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.h @@ -24,7 +24,7 @@ class EnterprisePlatformKeysInternalGenerateKeyFunction : public ChromeUIThreadExtensionFunction { private: virtual ~EnterprisePlatformKeysInternalGenerateKeyFunction(); - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; // Called when the key was generated. If an error occurred, |public_key_der| // will be empty and instead |error_message| be set. @@ -39,7 +39,7 @@ class EnterprisePlatformKeysInternalSignFunction : public ChromeUIThreadExtensionFunction { private: virtual ~EnterprisePlatformKeysInternalSignFunction(); - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; // Called when the signature was generated. If an error occurred, // |signature| will be empty and instead |error_message| be set. @@ -53,7 +53,7 @@ class EnterprisePlatformKeysGetCertificatesFunction : public ChromeUIThreadExtensionFunction { private: virtual ~EnterprisePlatformKeysGetCertificatesFunction(); - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; // Called when the list of certificates was determined. If an error occurred, // |certs| will be NULL and instead |error_message| be set. @@ -68,7 +68,7 @@ class EnterprisePlatformKeysImportCertificateFunction : public ChromeUIThreadExtensionFunction { private: virtual ~EnterprisePlatformKeysImportCertificateFunction(); - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; // Called when the certificate was imported. Only if an error occurred, // |error_message| will be set. @@ -82,7 +82,7 @@ class EnterprisePlatformKeysRemoveCertificateFunction : public ChromeUIThreadExtensionFunction { private: virtual ~EnterprisePlatformKeysRemoveCertificateFunction(); - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; // Called when the certificate was removed. Only if an error occurred, // |error_message| will be set. @@ -96,7 +96,7 @@ class EnterprisePlatformKeysInternalGetTokensFunction : public ChromeUIThreadExtensionFunction { private: virtual ~EnterprisePlatformKeysInternalGetTokensFunction(); - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; // Called when the list of tokens was determined. If an error occurred, // |token_ids| will be NULL and instead |error_message| be set. diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc index 5aaf147..cf5c23d 100644 --- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc +++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc @@ -168,7 +168,7 @@ class EnterprisePlatformKeysTest public: EnterprisePlatformKeysTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); // Enable the WebCrypto API. @@ -185,7 +185,7 @@ class EnterprisePlatformKeysTest command_line->AppendSwitchASCII(chromeos::switches::kLoginUser, user_email); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); if (GetParam().device_status_ == DEVICE_STATUS_ENROLLED) { @@ -203,7 +203,7 @@ class EnterprisePlatformKeysTest &policy_provider_); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { if (GetParam().system_token_ == SYSTEM_TOKEN_EXISTS) { base::RunLoop loop; content::BrowserThread::PostTask( @@ -238,7 +238,7 @@ class EnterprisePlatformKeysTest SetPolicy(); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { ExtensionApiTest::TearDownOnMainThread(); if (GetParam().system_token_ == SYSTEM_TOKEN_EXISTS) { diff --git a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h index 8c91d1f..c90d1c1 100644 --- a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h +++ b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h @@ -158,7 +158,7 @@ class EPKPChallengeMachineKey : public EPKPChallengeKeyBase { policy::EnterpriseInstallAttributes* install_attributes); protected: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: static const char kKeyName[]; @@ -195,7 +195,7 @@ class EPKPChallengeUserKey : public EPKPChallengeKeyBase { static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); protected: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: static const char kKeyName[]; diff --git a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc index 8bba948..2bb3c43 100644 --- a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc +++ b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc @@ -182,7 +182,7 @@ class EPKPChallengeKeyTestBase : public BrowserWithTestWindowTest { AddSettingsProvider(device_settings_provider_); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { BrowserWithTestWindowTest::SetUp(); // Set the user preferences. @@ -353,7 +353,7 @@ class EPKPChallengeUserKeyTest : public EPKPChallengeKeyTestBase { func_->set_extension(extension_.get()); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EPKPChallengeKeyTestBase::SetUp(); // Set the user preferences. diff --git a/chrome/browser/extensions/api/experience_sampling_private/experience_sampling_private_api.h b/chrome/browser/extensions/api/experience_sampling_private/experience_sampling_private_api.h index 6f61fa5..a512763 100644 --- a/chrome/browser/extensions/api/experience_sampling_private/experience_sampling_private_api.h +++ b/chrome/browser/extensions/api/experience_sampling_private/experience_sampling_private_api.h @@ -15,7 +15,7 @@ class ExperienceSamplingPrivateGetBrowserInfoFunction virtual ~ExperienceSamplingPrivateGetBrowserInfoFunction() {} // ExtensionFuction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: DECLARE_EXTENSION_FUNCTION("experienceSamplingPrivate.getBrowserInfo", diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.h b/chrome/browser/extensions/api/extension_action/extension_action_api.h index 38be9d5..2abf132 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_api.h +++ b/chrome/browser/extensions/api/extension_action/extension_action_api.h @@ -124,7 +124,7 @@ class ExtensionActionAPI : public BrowserContextKeyedAPI { content::WebContents* web_contents); // BrowserContextKeyedAPI implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; static const char* service_name() { return "ExtensionActionAPI"; } static const bool kServiceRedirectedInIncognito = true; @@ -149,7 +149,7 @@ class ExtensionActionFunction : public ChromeSyncExtensionFunction { protected: ExtensionActionFunction(); virtual ~ExtensionActionFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; virtual bool RunExtensionAction() = 0; bool ExtractDataFromArguments(); @@ -182,42 +182,42 @@ class ExtensionActionFunction : public ChromeSyncExtensionFunction { class ExtensionActionShowFunction : public ExtensionActionFunction { protected: virtual ~ExtensionActionShowFunction() {} - virtual bool RunExtensionAction() OVERRIDE; + virtual bool RunExtensionAction() override; }; // hide class ExtensionActionHideFunction : public ExtensionActionFunction { protected: virtual ~ExtensionActionHideFunction() {} - virtual bool RunExtensionAction() OVERRIDE; + virtual bool RunExtensionAction() override; }; // setIcon class ExtensionActionSetIconFunction : public ExtensionActionFunction { protected: virtual ~ExtensionActionSetIconFunction() {} - virtual bool RunExtensionAction() OVERRIDE; + virtual bool RunExtensionAction() override; }; // setTitle class ExtensionActionSetTitleFunction : public ExtensionActionFunction { protected: virtual ~ExtensionActionSetTitleFunction() {} - virtual bool RunExtensionAction() OVERRIDE; + virtual bool RunExtensionAction() override; }; // setPopup class ExtensionActionSetPopupFunction : public ExtensionActionFunction { protected: virtual ~ExtensionActionSetPopupFunction() {} - virtual bool RunExtensionAction() OVERRIDE; + virtual bool RunExtensionAction() override; }; // setBadgeText class ExtensionActionSetBadgeTextFunction : public ExtensionActionFunction { protected: virtual ~ExtensionActionSetBadgeTextFunction() {} - virtual bool RunExtensionAction() OVERRIDE; + virtual bool RunExtensionAction() override; }; // setBadgeBackgroundColor @@ -225,28 +225,28 @@ class ExtensionActionSetBadgeBackgroundColorFunction : public ExtensionActionFunction { protected: virtual ~ExtensionActionSetBadgeBackgroundColorFunction() {} - virtual bool RunExtensionAction() OVERRIDE; + virtual bool RunExtensionAction() override; }; // getTitle class ExtensionActionGetTitleFunction : public ExtensionActionFunction { protected: virtual ~ExtensionActionGetTitleFunction() {} - virtual bool RunExtensionAction() OVERRIDE; + virtual bool RunExtensionAction() override; }; // getPopup class ExtensionActionGetPopupFunction : public ExtensionActionFunction { protected: virtual ~ExtensionActionGetPopupFunction() {} - virtual bool RunExtensionAction() OVERRIDE; + virtual bool RunExtensionAction() override; }; // getBadgeText class ExtensionActionGetBadgeTextFunction : public ExtensionActionFunction { protected: virtual ~ExtensionActionGetBadgeTextFunction() {} - virtual bool RunExtensionAction() OVERRIDE; + virtual bool RunExtensionAction() override; }; // getBadgeBackgroundColor @@ -254,7 +254,7 @@ class ExtensionActionGetBadgeBackgroundColorFunction : public ExtensionActionFunction { protected: virtual ~ExtensionActionGetBadgeBackgroundColorFunction() {} - virtual bool RunExtensionAction() OVERRIDE; + virtual bool RunExtensionAction() override; }; // @@ -368,11 +368,11 @@ class BrowserActionOpenPopupFunction : public ChromeAsyncExtensionFunction, virtual ~BrowserActionOpenPopupFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; void OpenPopupTimedOut(); content::NotificationRegistrar registrar_; diff --git a/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc b/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc index d0fdc0f..6798c63 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc +++ b/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc @@ -16,7 +16,7 @@ namespace extensions { // Tests force hiding browser actions. class ExtensionPrefsHidingBrowserActions : public ExtensionPrefsTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { // Install 5 extensions. for (int i = 0; i < 5; i++) { std::string name = "test" + base::IntToString(i); @@ -35,7 +35,7 @@ class ExtensionPrefsHidingBrowserActions : public ExtensionPrefsTest { prefs(), extensions_[1]->id(), true); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { // Make sure the one we hid is hidden. EXPECT_FALSE(ExtensionActionAPI::GetBrowserActionVisibility( prefs(), extensions_[0]->id())); diff --git a/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc b/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc index 421c94a..e9dcd87 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc @@ -31,12 +31,12 @@ namespace extensions { class FeedbackTest : public ExtensionBrowserTest { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { extensions::ComponentLoader::EnableBackgroundExtensionsForTesting(); InProcessBrowserTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(::switches::kEnableUserMediaScreenCapturing); InProcessBrowserTest::SetUpCommandLine(command_line); } diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.h b/chrome/browser/extensions/api/feedback_private/feedback_private_api.h index 43f4de2..d979808 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.h +++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.h @@ -61,7 +61,7 @@ class FeedbackPrivateGetStringsFunction : public ChromeSyncExtensionFunction { virtual ~FeedbackPrivateGetStringsFunction() {} // SyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: static base::Closure* test_callback_; @@ -74,7 +74,7 @@ class FeedbackPrivateGetUserEmailFunction : public ChromeSyncExtensionFunction { protected: virtual ~FeedbackPrivateGetUserEmailFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FeedbackPrivateGetSystemInformationFunction @@ -85,7 +85,7 @@ class FeedbackPrivateGetSystemInformationFunction protected: virtual ~FeedbackPrivateGetSystemInformationFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnCompleted( @@ -100,7 +100,7 @@ class FeedbackPrivateSendFeedbackFunction protected: virtual ~FeedbackPrivateSendFeedbackFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnCompleted(bool success); diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc b/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc index 94cd0e3..0b12aecd 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc @@ -20,12 +20,12 @@ class FeedbackServiceImpl FeedbackServiceImpl(); virtual ~FeedbackServiceImpl(); - virtual std::string GetUserEmail() OVERRIDE; - virtual void GetHistograms(std::string* histograms) OVERRIDE; + virtual std::string GetUserEmail() override; + virtual void GetHistograms(std::string* histograms) override; private: // Overridden from FeedbackService: - virtual base::WeakPtr<FeedbackService> GetWeakPtr() OVERRIDE; + virtual base::WeakPtr<FeedbackService> GetWeakPtr() override; DISALLOW_COPY_AND_ASSIGN(FeedbackServiceImpl); }; diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc b/chrome/browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc index 72f8e94..e958a1b 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc @@ -20,12 +20,12 @@ class FeedbackServiceImpl FeedbackServiceImpl(); virtual ~FeedbackServiceImpl(); - virtual std::string GetUserEmail() OVERRIDE; - virtual void GetHistograms(std::string* histograms) OVERRIDE; + virtual std::string GetUserEmail() override; + virtual void GetHistograms(std::string* histograms) override; private: // Overridden from FeedbackService: - virtual base::WeakPtr<FeedbackService> GetWeakPtr() OVERRIDE; + virtual base::WeakPtr<FeedbackService> GetWeakPtr() override; DISALLOW_COPY_AND_ASSIGN(FeedbackServiceImpl); }; diff --git a/chrome/browser/extensions/api/file_handlers/mime_util_unittest.cc b/chrome/browser/extensions/api/file_handlers/mime_util_unittest.cc index 78fb6cd..f9c7c37 100644 --- a/chrome/browser/extensions/api/file_handlers/mime_util_unittest.cc +++ b/chrome/browser/extensions/api/file_handlers/mime_util_unittest.cc @@ -52,7 +52,7 @@ class FileHandlersMimeUtilTest : public testing::Test { FileHandlersMimeUtilTest() {} virtual ~FileHandlersMimeUtilTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); file_system_context_ = content::CreateFileSystemContextForTesting(NULL, data_dir_.path()); diff --git a/chrome/browser/extensions/api/file_system/entry_watcher_service.h b/chrome/browser/extensions/api/file_system/entry_watcher_service.h index 4e88989..a75448e 100644 --- a/chrome/browser/extensions/api/file_system/entry_watcher_service.h +++ b/chrome/browser/extensions/api/file_system/entry_watcher_service.h @@ -61,8 +61,8 @@ class EntryWatcherService : public KeyedService, const std::string& extension_id); // storage::WatcherManager::Observer overrides. - virtual void OnEntryChanged(const storage::FileSystemURL& url) OVERRIDE; - virtual void OnEntryRemoved(const storage::FileSystemURL& url) OVERRIDE; + virtual void OnEntryChanged(const storage::FileSystemURL& url) override; + virtual void OnEntryRemoved(const storage::FileSystemURL& url) override; // Sets a custom dispatcher for tests in order to be able to verify dispatched // events. diff --git a/chrome/browser/extensions/api/file_system/entry_watcher_service_factory.h b/chrome/browser/extensions/api/file_system/entry_watcher_service_factory.h index 36296a4..0fe06fc 100644 --- a/chrome/browser/extensions/api/file_system/entry_watcher_service_factory.h +++ b/chrome/browser/extensions/api/file_system/entry_watcher_service_factory.h @@ -38,8 +38,8 @@ class EntryWatcherServiceFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory overrides: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; + content::BrowserContext* profile) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; DISALLOW_COPY_AND_ASSIGN(EntryWatcherServiceFactory); }; diff --git a/chrome/browser/extensions/api/file_system/entry_watcher_service_unittest.cc b/chrome/browser/extensions/api/file_system/entry_watcher_service_unittest.cc index 67752a6..80d1cbc 100644 --- a/chrome/browser/extensions/api/file_system/entry_watcher_service_unittest.cc +++ b/chrome/browser/extensions/api/file_system/entry_watcher_service_unittest.cc @@ -36,7 +36,7 @@ class EntryWatcherServiceTest : public testing::Test { EntryWatcherServiceTest() {} virtual ~EntryWatcherServiceTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { profile_.reset(new TestingProfile); ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); file_system_context_ = @@ -53,7 +53,7 @@ class EntryWatcherServiceTest : public testing::Test { base::FilePath::FromUTF8Unsafe("/x/y/z")); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { dispatch_event_log_targets_.clear(); dispatch_event_log_events_.clear(); } diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc index 91e945a..a2b27a3c 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api.cc @@ -431,7 +431,7 @@ class FileSystemChooseEntryFunction::FilePicker // ui::SelectFileDialog::Listener implementation. virtual void FileSelected(const base::FilePath& path, int index, - void* params) OVERRIDE { + void* params) override { std::vector<base::FilePath> paths; paths.push_back(path); MultiFilesSelected(paths, params); @@ -439,7 +439,7 @@ class FileSystemChooseEntryFunction::FilePicker virtual void FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file, int index, - void* params) OVERRIDE { + void* params) override { // Normally, file.local_path is used because it is a native path to the // local read-only cached file in the case of remote file system like // Chrome OS's Google Drive integration. Here, however, |file.file_path| is @@ -452,14 +452,14 @@ class FileSystemChooseEntryFunction::FilePicker } virtual void MultiFilesSelected(const std::vector<base::FilePath>& files, - void* params) OVERRIDE { + void* params) override { function_->FilesSelected(files); delete this; } virtual void MultiFilesSelectedWithExtraInfo( const std::vector<ui::SelectedFileInfo>& files, - void* params) OVERRIDE { + void* params) override { std::vector<base::FilePath> paths; for (std::vector<ui::SelectedFileInfo>::const_iterator it = files.begin(); it != files.end(); ++it) { @@ -468,7 +468,7 @@ class FileSystemChooseEntryFunction::FilePicker MultiFilesSelected(paths, params); } - virtual void FileSelectionCanceled(void* params) OVERRIDE { + virtual void FileSelectionCanceled(void* params) override { function_->FileSelectionCanceled(); delete this; } diff --git a/chrome/browser/extensions/api/file_system/file_system_api.h b/chrome/browser/extensions/api/file_system/file_system_api.h index 1d16abe..b2cb1ad 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.h +++ b/chrome/browser/extensions/api/file_system/file_system_api.h @@ -41,7 +41,7 @@ class FileSystemGetDisplayPathFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemGetDisplayPathFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FileSystemEntryFunction : public ChromeAsyncExtensionFunction { @@ -89,7 +89,7 @@ class FileSystemGetWritableEntryFunction : public FileSystemEntryFunction { protected: virtual ~FileSystemGetWritableEntryFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void CheckPermissionAndSendResponse(); @@ -106,7 +106,7 @@ class FileSystemIsWritableEntryFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemIsWritableEntryFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FileSystemChooseEntryFunction : public FileSystemEntryFunction { @@ -146,7 +146,7 @@ class FileSystemChooseEntryFunction : public FileSystemEntryFunction { class FilePicker; virtual ~FileSystemChooseEntryFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void ShowPicker(const ui::SelectFileDialog::FileTypeInfo& file_type_info, ui::SelectFileDialog::Type picker_type); @@ -178,7 +178,7 @@ class FileSystemRetainEntryFunction : public ChromeAsyncExtensionFunction { protected: virtual ~FileSystemRetainEntryFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Retains the file entry referenced by |entry_id| in apps::SavedFilesService. @@ -200,7 +200,7 @@ class FileSystemIsRestorableFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemIsRestorableFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FileSystemRestoreEntryFunction : public FileSystemEntryFunction { @@ -209,7 +209,7 @@ class FileSystemRestoreEntryFunction : public FileSystemEntryFunction { protected: virtual ~FileSystemRestoreEntryFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class FileSystemObserveDirectoryFunction : public ChromeSyncExtensionFunction { @@ -219,7 +219,7 @@ class FileSystemObserveDirectoryFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemObserveDirectoryFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FileSystemUnobserveEntryFunction : public ChromeSyncExtensionFunction { @@ -229,7 +229,7 @@ class FileSystemUnobserveEntryFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemUnobserveEntryFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FileSystemGetObservedEntriesFunction @@ -240,7 +240,7 @@ class FileSystemGetObservedEntriesFunction protected: virtual ~FileSystemGetObservedEntriesFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest.cc b/chrome/browser/extensions/api/file_system/file_system_apitest.cc index 312c9b3..91939f7 100644 --- a/chrome/browser/extensions/api/file_system/file_system_apitest.cc +++ b/chrome/browser/extensions/api/file_system/file_system_apitest.cc @@ -32,7 +32,7 @@ class AppLoadObserver : public ExtensionRegistryObserver { } virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE { + const Extension* extension) override { callback_.Run(extension); } @@ -64,7 +64,7 @@ const int kGraylistedPath = base::DIR_HOME; class FileSystemApiTest : public PlatformAppBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { PlatformAppBrowserTest::SetUpCommandLine(command_line); test_root_folder_ = test_data_dir_.AppendASCII("api_test") .AppendASCII("file_system"); @@ -72,11 +72,11 @@ class FileSystemApiTest : public PlatformAppBrowserTest { "test_root", test_root_folder_); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ClearCommandLineArgs(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { FileSystemChooseEntryFunction::StopSkippingPickerForTest(); PlatformAppBrowserTest::TearDown(); }; diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc index 45c9d8d..7e7b970 100644 --- a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc +++ b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc @@ -28,7 +28,7 @@ class FileSystemApiTestForDrive : public PlatformAppBrowserTest { // Sets up fake Drive service for tests (this has to be injected before the // real DriveIntegrationService instance is created.) - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { PlatformAppBrowserTest::SetUpInProcessBrowserTestFixture(); extensions::ComponentLoader::EnableBackgroundExtensionsForTesting(); @@ -44,7 +44,7 @@ class FileSystemApiTestForDrive : public PlatformAppBrowserTest { // Ensure the fake service's data is fetch in the local file system. This is // necessary because the fetch starts lazily upon the first read operation. - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { PlatformAppBrowserTest::SetUpOnMainThread(); scoped_ptr<drive::ResourceEntry> entry; @@ -56,7 +56,7 @@ class FileSystemApiTestForDrive : public PlatformAppBrowserTest { ASSERT_EQ(drive::FILE_ERROR_OK, error); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { FileSystemChooseEntryFunction::StopSkippingPickerForTest(); PlatformAppBrowserTest::TearDown(); }; diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.h b/chrome/browser/extensions/api/font_settings/font_settings_api.h index f5c8416..b2dc212 100644 --- a/chrome/browser/extensions/api/font_settings/font_settings_api.h +++ b/chrome/browser/extensions/api/font_settings/font_settings_api.h @@ -105,7 +105,7 @@ class FontSettingsClearFontFunction : public ChromeSyncExtensionFunction { virtual ~FontSettingsClearFontFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // fontSettings.getFont API function. @@ -117,7 +117,7 @@ class FontSettingsGetFontFunction : public ChromeSyncExtensionFunction { virtual ~FontSettingsGetFontFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // fontSettings.setFont API function. @@ -129,7 +129,7 @@ class FontSettingsSetFontFunction : public ChromeSyncExtensionFunction { virtual ~FontSettingsSetFontFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // fontSettings.getFontList API function. @@ -142,7 +142,7 @@ class FontSettingsGetFontListFunction : public ChromeAsyncExtensionFunction { virtual ~FontSettingsGetFontListFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void FontListHasLoaded(scoped_ptr<base::ListValue> list); @@ -155,7 +155,7 @@ class ClearFontPrefExtensionFunction : public ChromeSyncExtensionFunction { virtual ~ClearFontPrefExtensionFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; // Implementations should return the name of the preference to clear, like // "webkit.webprefs.default_font_size". @@ -168,7 +168,7 @@ class GetFontPrefExtensionFunction : public ChromeSyncExtensionFunction { virtual ~GetFontPrefExtensionFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; // Implementations should return the name of the preference to get, like // "webkit.webprefs.default_font_size". @@ -185,7 +185,7 @@ class SetFontPrefExtensionFunction : public ChromeSyncExtensionFunction { virtual ~SetFontPrefExtensionFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; // Implementations should return the name of the preference to set, like // "webkit.webprefs.default_font_size". @@ -209,7 +209,7 @@ class FontSettingsClearDefaultFontSizeFunction virtual ~FontSettingsClearDefaultFontSizeFunction() {} // ClearFontPrefExtensionFunction: - virtual const char* GetPrefName() OVERRIDE; + virtual const char* GetPrefName() override; }; class FontSettingsGetDefaultFontSizeFunction @@ -222,8 +222,8 @@ class FontSettingsGetDefaultFontSizeFunction virtual ~FontSettingsGetDefaultFontSizeFunction() {} // GetFontPrefExtensionFunction: - virtual const char* GetPrefName() OVERRIDE; - virtual const char* GetKey() OVERRIDE; + virtual const char* GetPrefName() override; + virtual const char* GetKey() override; }; class FontSettingsSetDefaultFontSizeFunction @@ -236,8 +236,8 @@ class FontSettingsSetDefaultFontSizeFunction virtual ~FontSettingsSetDefaultFontSizeFunction() {} // SetFontPrefExtensionFunction: - virtual const char* GetPrefName() OVERRIDE; - virtual const char* GetKey() OVERRIDE; + virtual const char* GetPrefName() override; + virtual const char* GetKey() override; }; class FontSettingsClearDefaultFixedFontSizeFunction @@ -250,7 +250,7 @@ class FontSettingsClearDefaultFixedFontSizeFunction virtual ~FontSettingsClearDefaultFixedFontSizeFunction() {} // ClearFontPrefExtensionFunction: - virtual const char* GetPrefName() OVERRIDE; + virtual const char* GetPrefName() override; }; class FontSettingsGetDefaultFixedFontSizeFunction @@ -263,8 +263,8 @@ class FontSettingsGetDefaultFixedFontSizeFunction virtual ~FontSettingsGetDefaultFixedFontSizeFunction() {} // GetFontPrefExtensionFunction: - virtual const char* GetPrefName() OVERRIDE; - virtual const char* GetKey() OVERRIDE; + virtual const char* GetPrefName() override; + virtual const char* GetKey() override; }; class FontSettingsSetDefaultFixedFontSizeFunction @@ -277,8 +277,8 @@ class FontSettingsSetDefaultFixedFontSizeFunction virtual ~FontSettingsSetDefaultFixedFontSizeFunction() {} // SetFontPrefExtensionFunction: - virtual const char* GetPrefName() OVERRIDE; - virtual const char* GetKey() OVERRIDE; + virtual const char* GetPrefName() override; + virtual const char* GetKey() override; }; class FontSettingsClearMinimumFontSizeFunction @@ -291,7 +291,7 @@ class FontSettingsClearMinimumFontSizeFunction virtual ~FontSettingsClearMinimumFontSizeFunction() {} // ClearFontPrefExtensionFunction: - virtual const char* GetPrefName() OVERRIDE; + virtual const char* GetPrefName() override; }; class FontSettingsGetMinimumFontSizeFunction @@ -304,8 +304,8 @@ class FontSettingsGetMinimumFontSizeFunction virtual ~FontSettingsGetMinimumFontSizeFunction() {} // GetFontPrefExtensionFunction: - virtual const char* GetPrefName() OVERRIDE; - virtual const char* GetKey() OVERRIDE; + virtual const char* GetPrefName() override; + virtual const char* GetKey() override; }; class FontSettingsSetMinimumFontSizeFunction @@ -318,8 +318,8 @@ class FontSettingsSetMinimumFontSizeFunction virtual ~FontSettingsSetMinimumFontSizeFunction() {} // SetFontPrefExtensionFunction: - virtual const char* GetPrefName() OVERRIDE; - virtual const char* GetKey() OVERRIDE; + virtual const char* GetPrefName() override; + virtual const char* GetKey() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc b/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc index 7f97009..8a342ff 100644 --- a/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc +++ b/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc @@ -149,16 +149,16 @@ class GcdPrivateAPIImpl : public EventRouter::Observer, PasswordMap; // EventRouter::Observer implementation. - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; - virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; + virtual void OnListenerRemoved(const EventListenerInfo& details) override; // local_discovery::PrivetDeviceLister implementation. virtual void DeviceChanged( bool added, const std::string& name, - const local_discovery::DeviceDescription& description) OVERRIDE; - virtual void DeviceRemoved(const std::string& name) OVERRIDE; - virtual void DeviceCacheFlushed() OVERRIDE; + const local_discovery::DeviceDescription& description) override; + virtual void DeviceRemoved(const std::string& name) override; + virtual void DeviceCacheFlushed() override; void SendMessageInternal(int session_id, const std::string& api, @@ -199,12 +199,12 @@ class GcdPrivateRequest : public local_discovery::PrivetV3Session::Request { virtual ~GcdPrivateRequest(); // local_discovery::PrivetV3Session::Request implementation. - virtual std::string GetName() OVERRIDE; - virtual const base::DictionaryValue& GetInput() OVERRIDE; + virtual std::string GetName() override; + virtual const base::DictionaryValue& GetInput() override; virtual void OnError( - local_discovery::PrivetURLFetcher::ErrorType error) OVERRIDE; + local_discovery::PrivetURLFetcher::ErrorType error) override; virtual void OnParsedJson(const base::DictionaryValue& value, - bool has_error) OVERRIDE; + bool has_error) override; private: std::string api_; @@ -242,8 +242,8 @@ class GcdPrivateSessionHolder // local_discovery::PrivetV3Session::Delegate implementation. virtual void OnSetupConfirmationNeeded( const std::string& confirmation_code, - api::gcd_private::ConfirmationType confirmation_type) OVERRIDE; - virtual void OnSessionStatus(api::gcd_private::Status status) OVERRIDE; + api::gcd_private::ConfirmationType confirmation_type) override; + virtual void OnSessionStatus(api::gcd_private::Status status) override; scoped_ptr<local_discovery::PrivetHTTPClient> http_client_; scoped_ptr<local_discovery::PrivetV3Session> privet_session_; diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_api.h b/chrome/browser/extensions/api/gcd_private/gcd_private_api.h index 7e701c9..bce1118 100644 --- a/chrome/browser/extensions/api/gcd_private/gcd_private_api.h +++ b/chrome/browser/extensions/api/gcd_private/gcd_private_api.h @@ -59,12 +59,12 @@ class GcdPrivateGetCloudDeviceListFunction virtual ~GcdPrivateGetCloudDeviceListFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // CloudDeviceListDelegate implementation - virtual void OnDeviceListReady(const DeviceList& devices) OVERRIDE; - virtual void OnDeviceListUnavailable() OVERRIDE; + virtual void OnDeviceListReady(const DeviceList& devices) override; + virtual void OnDeviceListUnavailable() override; void CheckListingDone(); @@ -88,7 +88,7 @@ class GcdPrivateQueryForNewLocalDevicesFunction virtual ~GcdPrivateQueryForNewLocalDevicesFunction(); // SyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class GcdPrivatePrefetchWifiPasswordFunction @@ -103,7 +103,7 @@ class GcdPrivatePrefetchWifiPasswordFunction virtual ~GcdPrivatePrefetchWifiPasswordFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void OnResponse(bool response); }; @@ -120,7 +120,7 @@ class GcdPrivateGetPrefetchedWifiNameListFunction virtual ~GcdPrivateGetPrefetchedWifiNameListFunction(); // SyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class GcdPrivateEstablishSessionFunction : public ChromeAsyncExtensionFunction { @@ -134,7 +134,7 @@ class GcdPrivateEstablishSessionFunction : public ChromeAsyncExtensionFunction { virtual ~GcdPrivateEstablishSessionFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnConfirmCodeCallback( @@ -154,7 +154,7 @@ class GcdPrivateConfirmCodeFunction : public ChromeAsyncExtensionFunction { virtual ~GcdPrivateConfirmCodeFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnSessionEstablishedCallback(api::gcd_private::Status status); @@ -170,7 +170,7 @@ class GcdPrivateSendMessageFunction : public ChromeAsyncExtensionFunction { virtual ~GcdPrivateSendMessageFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnMessageSentCallback(api::gcd_private::Status status, @@ -188,7 +188,7 @@ class GcdPrivateTerminateSessionFunction : public ChromeAsyncExtensionFunction { virtual ~GcdPrivateTerminateSessionFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class GcdPrivateGetCommandDefinitionsFunction @@ -203,7 +203,7 @@ class GcdPrivateGetCommandDefinitionsFunction virtual ~GcdPrivateGetCommandDefinitionsFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: }; @@ -219,7 +219,7 @@ class GcdPrivateInsertCommandFunction : public ChromeAsyncExtensionFunction { virtual ~GcdPrivateInsertCommandFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: }; @@ -234,7 +234,7 @@ class GcdPrivateGetCommandFunction : public ChromeAsyncExtensionFunction { virtual ~GcdPrivateGetCommandFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: }; @@ -250,7 +250,7 @@ class GcdPrivateCancelCommandFunction : public ChromeAsyncExtensionFunction { virtual ~GcdPrivateCancelCommandFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: }; @@ -266,7 +266,7 @@ class GcdPrivateGetCommandsListFunction : public ChromeAsyncExtensionFunction { virtual ~GcdPrivateGetCommandsListFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: }; diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc b/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc index 240ba59..e43f171 100644 --- a/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc +++ b/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc @@ -177,7 +177,7 @@ class FakeGCDApiFlowFactory extensions::GcdPrivateAPI::SetGCDApiFlowFactoryForTests(NULL); } - virtual scoped_ptr<local_discovery::GCDApiFlow> CreateGCDApiFlow() OVERRIDE { + virtual scoped_ptr<local_discovery::GCDApiFlow> CreateGCDApiFlow() override { return scoped_ptr<local_discovery::GCDApiFlow>(new FakeGCDApiFlow(this)); } @@ -193,7 +193,7 @@ class FakeGCDApiFlowFactory virtual ~FakeGCDApiFlow() {} - virtual void Start(scoped_ptr<Request> request) OVERRIDE { + virtual void Start(scoped_ptr<Request> request) override { std::string response_str = factory_->responses_[request->GetURL()]; if (response_str == kResponseValueFailure) { @@ -228,7 +228,7 @@ class GcdPrivateAPITest : public ExtensionApiTest { #endif // ENABLE_MDNS } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( extensions::switches::kWhitelistedExtensionID, diff --git a/chrome/browser/extensions/api/gcm/gcm_api.h b/chrome/browser/extensions/api/gcm/gcm_api.h index 322a5d2..01a21cc 100644 --- a/chrome/browser/extensions/api/gcm/gcm_api.h +++ b/chrome/browser/extensions/api/gcm/gcm_api.h @@ -26,7 +26,7 @@ class GcmApiFunction : public AsyncExtensionFunction { virtual ~GcmApiFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE FINAL; + virtual bool RunAsync() override final; // Actual implementation of specific functions. virtual bool DoWork() = 0; @@ -47,7 +47,7 @@ class GcmRegisterFunction : public GcmApiFunction { virtual ~GcmRegisterFunction(); // Register function implementation. - virtual bool DoWork() OVERRIDE FINAL; + virtual bool DoWork() override final; private: void CompleteFunctionWithResult(const std::string& registration_id, @@ -64,7 +64,7 @@ class GcmUnregisterFunction : public GcmApiFunction { virtual ~GcmUnregisterFunction(); // Register function implementation. - virtual bool DoWork() OVERRIDE FINAL; + virtual bool DoWork() override final; private: void CompleteFunctionWithResult(gcm::GCMClient::Result result); @@ -80,7 +80,7 @@ class GcmSendFunction : public GcmApiFunction { virtual ~GcmSendFunction(); // Send function implementation. - virtual bool DoWork() OVERRIDE FINAL; + virtual bool DoWork() override final; private: void CompleteFunctionWithResult(const std::string& message_id, diff --git a/chrome/browser/extensions/api/gcm/gcm_apitest.cc b/chrome/browser/extensions/api/gcm/gcm_apitest.cc index b6b07a5..0889c1d 100644 --- a/chrome/browser/extensions/api/gcm/gcm_apitest.cc +++ b/chrome/browser/extensions/api/gcm/gcm_apitest.cc @@ -61,8 +61,8 @@ class GcmApiTest : public ExtensionApiTest { GcmApiTest() : fake_gcm_profile_service_(NULL) {} protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; + virtual void SetUpCommandLine(CommandLine* command_line) override; + virtual void SetUpOnMainThread() override; void StartCollecting(); diff --git a/chrome/browser/extensions/api/history/history_api.h b/chrome/browser/extensions/api/history/history_api.h index 7b380fb..660f96d 100644 --- a/chrome/browser/extensions/api/history/history_api.h +++ b/chrome/browser/extensions/api/history/history_api.h @@ -35,7 +35,7 @@ class HistoryEventRouter : public content::NotificationObserver { // content::NotificationObserver::Observe. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; void HistoryUrlVisited(Profile* profile, const history::URLVisitedDetails* details); @@ -59,13 +59,13 @@ class HistoryAPI : public BrowserContextKeyedAPI, public EventRouter::Observer { virtual ~HistoryAPI(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<HistoryAPI>* GetFactoryInstance(); // EventRouter::Observer implementation. - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; private: friend class BrowserContextKeyedAPIFactory<HistoryAPI>; @@ -105,7 +105,7 @@ class HistoryFunctionWithCallback : public HistoryFunction { virtual ~HistoryFunctionWithCallback(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Return true if the async call was completed, false otherwise. virtual bool RunAsyncImpl() = 0; @@ -131,7 +131,7 @@ class HistoryGetVisitsFunction : public HistoryFunctionWithCallback { virtual ~HistoryGetVisitsFunction() {} // HistoryFunctionWithCallback: - virtual bool RunAsyncImpl() OVERRIDE; + virtual bool RunAsyncImpl() override; // Callback for the history function to provide results. void QueryComplete(bool success, @@ -147,7 +147,7 @@ class HistorySearchFunction : public HistoryFunctionWithCallback { virtual ~HistorySearchFunction() {} // HistoryFunctionWithCallback: - virtual bool RunAsyncImpl() OVERRIDE; + virtual bool RunAsyncImpl() override; // Callback for the history function to provide results. void SearchComplete(history::QueryResults* results); @@ -161,7 +161,7 @@ class HistoryAddUrlFunction : public HistoryFunction { virtual ~HistoryAddUrlFunction() {} // HistoryFunctionWithCallback: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class HistoryDeleteAllFunction : public HistoryFunctionWithCallback { @@ -172,7 +172,7 @@ class HistoryDeleteAllFunction : public HistoryFunctionWithCallback { virtual ~HistoryDeleteAllFunction() {} // HistoryFunctionWithCallback: - virtual bool RunAsyncImpl() OVERRIDE; + virtual bool RunAsyncImpl() override; // Callback for the history service to acknowledge deletion. void DeleteComplete(); @@ -187,7 +187,7 @@ class HistoryDeleteUrlFunction : public HistoryFunction { virtual ~HistoryDeleteUrlFunction() {} // HistoryFunctionWithCallback: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class HistoryDeleteRangeFunction : public HistoryFunctionWithCallback { @@ -198,7 +198,7 @@ class HistoryDeleteRangeFunction : public HistoryFunctionWithCallback { virtual ~HistoryDeleteRangeFunction() {} // HistoryFunctionWithCallback: - virtual bool RunAsyncImpl() OVERRIDE; + virtual bool RunAsyncImpl() override; // Callback for the history service to acknowledge deletion. void DeleteComplete(); diff --git a/chrome/browser/extensions/api/history/history_apitest.cc b/chrome/browser/extensions/api/history/history_apitest.cc index 8ee687a..b3af0d8 100644 --- a/chrome/browser/extensions/api/history/history_apitest.cc +++ b/chrome/browser/extensions/api/history/history_apitest.cc @@ -14,7 +14,7 @@ namespace extensions { class HistoryApiTest : public ExtensionApiTest { public: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); host_resolver()->AddRule("www.a.com", "127.0.0.1"); diff --git a/chrome/browser/extensions/api/hotword_private/hotword_private_api.h b/chrome/browser/extensions/api/hotword_private/hotword_private_api.h index 62a8f0c..9a7b371 100644 --- a/chrome/browser/extensions/api/hotword_private/hotword_private_api.h +++ b/chrome/browser/extensions/api/hotword_private/hotword_private_api.h @@ -23,7 +23,7 @@ class HotwordPrivateEventService : public BrowserContextKeyedAPI { virtual ~HotwordPrivateEventService(); // BrowserContextKeyedAPI implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; static BrowserContextKeyedAPIFactory<HotwordPrivateEventService>* GetFactoryInstance(); static const char* service_name(); @@ -53,7 +53,7 @@ class HotwordPrivateSetEnabledFunction : public ChromeSyncExtensionFunction { virtual ~HotwordPrivateSetEnabledFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class HotwordPrivateSetAudioLoggingEnabledFunction @@ -66,7 +66,7 @@ class HotwordPrivateSetAudioLoggingEnabledFunction virtual ~HotwordPrivateSetAudioLoggingEnabledFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class HotwordPrivateSetHotwordAlwaysOnSearchEnabledFunction @@ -79,7 +79,7 @@ class HotwordPrivateSetHotwordAlwaysOnSearchEnabledFunction virtual ~HotwordPrivateSetHotwordAlwaysOnSearchEnabledFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class HotwordPrivateGetStatusFunction : public ChromeSyncExtensionFunction { @@ -91,7 +91,7 @@ class HotwordPrivateGetStatusFunction : public ChromeSyncExtensionFunction { virtual ~HotwordPrivateGetStatusFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class HotwordPrivateSetHotwordSessionStateFunction @@ -104,7 +104,7 @@ class HotwordPrivateSetHotwordSessionStateFunction virtual ~HotwordPrivateSetHotwordSessionStateFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class HotwordPrivateNotifyHotwordRecognitionFunction @@ -117,7 +117,7 @@ class HotwordPrivateNotifyHotwordRecognitionFunction virtual ~HotwordPrivateNotifyHotwordRecognitionFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class HotwordPrivateGetLaunchStateFunction : @@ -130,7 +130,7 @@ class HotwordPrivateGetLaunchStateFunction : virtual ~HotwordPrivateGetLaunchStateFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc b/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc index 6f4dc49..def38dd 100644 --- a/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc +++ b/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc @@ -26,7 +26,7 @@ class MockHotwordService : public HotwordService { : HotwordService(profile), service_available_(true) {}; virtual ~MockHotwordService() {} - virtual bool IsServiceAvailable() OVERRIDE { + virtual bool IsServiceAvailable() override { return service_available_; } @@ -38,7 +38,7 @@ class MockHotwordService : public HotwordService { return new MockHotwordService(static_cast<Profile*>(profile)); } - virtual LaunchMode GetHotwordAudioVerificationLaunchMode() OVERRIDE { + virtual LaunchMode GetHotwordAudioVerificationLaunchMode() override { return launch_mode_; } @@ -63,12 +63,12 @@ class MockHotwordClient : public HotwordClient { virtual ~MockHotwordClient() {} - virtual void OnHotwordStateChanged(bool enabled) OVERRIDE { + virtual void OnHotwordStateChanged(bool enabled) override { last_enabled_ = enabled; state_changed_count_++; } - virtual void OnHotwordRecognized() OVERRIDE { + virtual void OnHotwordRecognized() override { recognized_count_++; } @@ -89,7 +89,7 @@ class HotwordPrivateApiTest : public ExtensionApiTest { HotwordPrivateApiTest() {} virtual ~HotwordPrivateApiTest() {} - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(base::CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); // Whitelist the test extensions (which all share a common ID) to use @@ -98,7 +98,7 @@ class HotwordPrivateApiTest : public ExtensionApiTest { extensions::switches::kWhitelistedExtensionID, kHotwordTestExtensionId); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); test_data_dir_ = test_data_dir_.AppendASCII("hotword_private"); diff --git a/chrome/browser/extensions/api/i18n/i18n_api.h b/chrome/browser/extensions/api/i18n/i18n_api.h index df2de9d..f99e499 100644 --- a/chrome/browser/extensions/api/i18n/i18n_api.h +++ b/chrome/browser/extensions/api/i18n/i18n_api.h @@ -14,7 +14,7 @@ namespace extensions { class I18nGetAcceptLanguagesFunction : public ChromeSyncExtensionFunction { virtual ~I18nGetAcceptLanguagesFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("i18n.getAcceptLanguages", I18N_GETACCEPTLANGUAGES) }; diff --git a/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h b/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h index 7eab8a5..2539e68 100644 --- a/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h +++ b/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h @@ -70,13 +70,13 @@ class GaiaWebAuthFlow : public UbertokenConsumer, public WebAuthFlow::Delegate { virtual void Start(); // UbertokenConsumer implementation: - virtual void OnUbertokenSuccess(const std::string& token) OVERRIDE; - virtual void OnUbertokenFailure(const GoogleServiceAuthError& error) OVERRIDE; + virtual void OnUbertokenSuccess(const std::string& token) override; + virtual void OnUbertokenFailure(const GoogleServiceAuthError& error) override; // WebAuthFlow::Delegate implementation. - virtual void OnAuthFlowFailure(WebAuthFlow::Failure failure) OVERRIDE; - virtual void OnAuthFlowURLChange(const GURL& redirect_url) OVERRIDE; - virtual void OnAuthFlowTitleChange(const std::string& title) OVERRIDE; + virtual void OnAuthFlowFailure(WebAuthFlow::Failure failure) override; + virtual void OnAuthFlowURLChange(const GURL& redirect_url) override; + virtual void OnAuthFlowTitleChange(const std::string& title) override; private: // Creates a WebAuthFlow, which will navigate to |url|. Can override diff --git a/chrome/browser/extensions/api/identity/gaia_web_auth_flow_unittest.cc b/chrome/browser/extensions/api/identity/gaia_web_auth_flow_unittest.cc index 2027421..8b09815 100644 --- a/chrome/browser/extensions/api/identity/gaia_web_auth_flow_unittest.cc +++ b/chrome/browser/extensions/api/identity/gaia_web_auth_flow_unittest.cc @@ -22,7 +22,7 @@ class FakeWebAuthFlow : public WebAuthFlow { GURL(), WebAuthFlow::INTERACTIVE) {} - virtual void Start() OVERRIDE {} + virtual void Start() override {} }; class TestGaiaWebAuthFlow : public GaiaWebAuthFlow { @@ -34,7 +34,7 @@ class TestGaiaWebAuthFlow : public GaiaWebAuthFlow { : GaiaWebAuthFlow(delegate, NULL, token_key, oauth2_client_id, "en-us"), ubertoken_error_(ubertoken_error_state) {} - virtual void Start() OVERRIDE { + virtual void Start() override { if (ubertoken_error_.state() == GoogleServiceAuthError::NONE) OnUbertokenSuccess("fake_ubertoken"); else @@ -42,7 +42,7 @@ class TestGaiaWebAuthFlow : public GaiaWebAuthFlow { } private: - virtual scoped_ptr<WebAuthFlow> CreateWebAuthFlow(GURL url) OVERRIDE { + virtual scoped_ptr<WebAuthFlow> CreateWebAuthFlow(GURL url) override { return scoped_ptr<WebAuthFlow>(new FakeWebAuthFlow(this)); } diff --git a/chrome/browser/extensions/api/identity/identity_api.h b/chrome/browser/extensions/api/identity/identity_api.h index 3a062b4d..f3dc5b0 100644 --- a/chrome/browser/extensions/api/identity/identity_api.h +++ b/chrome/browser/extensions/api/identity/identity_api.h @@ -113,14 +113,14 @@ class IdentityAPI : public BrowserContextKeyedAPI, std::string FindAccountKeyByGaiaId(const std::string& gaia_id); // BrowserContextKeyedAPI implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; static BrowserContextKeyedAPIFactory<IdentityAPI>* GetFactoryInstance(); // gaia::AccountTracker::Observer implementation: - virtual void OnAccountAdded(const gaia::AccountIds& ids) OVERRIDE; - virtual void OnAccountRemoved(const gaia::AccountIds& ids) OVERRIDE; + virtual void OnAccountAdded(const gaia::AccountIds& ids) override; + virtual void OnAccountRemoved(const gaia::AccountIds& ids) override; virtual void OnAccountSignInChanged(const gaia::AccountIds& ids, - bool is_signed_in) OVERRIDE; + bool is_signed_in) override; void AddShutdownObserver(ShutdownObserver* observer); void RemoveShutdownObserver(ShutdownObserver* observer); @@ -156,7 +156,7 @@ class IdentityGetAccountsFunction : public ChromeUIThreadExtensionFunction { virtual ~IdentityGetAccountsFunction(); // UIThreadExtensionFunction implementation. - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; // identity.getAuthToken fetches an OAuth 2 function for the @@ -197,15 +197,15 @@ class IdentityGetAuthTokenFunction : public ChromeAsyncExtensionFunction, virtual ~IdentityGetAuthTokenFunction(); // IdentitySigninFlow::Delegate implementation: - virtual void SigninSuccess() OVERRIDE; - virtual void SigninFailed() OVERRIDE; + virtual void SigninSuccess() override; + virtual void SigninFailed() override; // GaiaWebAuthFlow::Delegate implementation: virtual void OnGaiaFlowFailure(GaiaWebAuthFlow::Failure failure, GoogleServiceAuthError service_error, - const std::string& oauth_error) OVERRIDE; + const std::string& oauth_error) override; virtual void OnGaiaFlowCompleted(const std::string& access_token, - const std::string& expiration) OVERRIDE; + const std::string& expiration) override; // Starts a login access token request. virtual void StartLoginAccessTokenRequest(); @@ -213,9 +213,9 @@ class IdentityGetAuthTokenFunction : public ChromeAsyncExtensionFunction, // OAuth2TokenService::Consumer implementation: virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request, const std::string& access_token, - const base::Time& expiration_time) OVERRIDE; + const base::Time& expiration_time) override; virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request, - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; scoped_ptr<OAuth2TokenService::Request> login_token_request_; @@ -228,7 +228,7 @@ class IdentityGetAuthTokenFunction : public ChromeAsyncExtensionFunction, FRIEND_TEST_ALL_PREFIXES(GetAuthTokenFunctionTest, NoninteractiveShutdown); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Helpers to report async function results to the caller. void StartAsyncRun(); @@ -242,18 +242,18 @@ class IdentityGetAuthTokenFunction : public ChromeAsyncExtensionFunction, void CompleteMintTokenFlow(); // IdentityMintRequestQueue::Request implementation: - virtual void StartMintToken(IdentityMintRequestQueue::MintType type) OVERRIDE; + virtual void StartMintToken(IdentityMintRequestQueue::MintType type) override; // OAuth2MintTokenFlow::Delegate implementation: virtual void OnMintTokenSuccess(const std::string& access_token, - int time_to_live) OVERRIDE; + int time_to_live) override; virtual void OnMintTokenFailure( - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; virtual void OnIssueAdviceSuccess( - const IssueAdviceInfo& issue_advice) OVERRIDE; + const IssueAdviceInfo& issue_advice) override; // IdentityAPI::ShutdownObserver implementation: - virtual void OnShutdown() OVERRIDE; + virtual void OnShutdown() override; #if defined(OS_CHROMEOS) // Starts a login access token request for device robot account. This method @@ -307,7 +307,7 @@ class IdentityGetProfileUserInfoFunction virtual ~IdentityGetProfileUserInfoFunction(); // UIThreadExtensionFunction implementation. - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; class IdentityRemoveCachedAuthTokenFunction @@ -321,7 +321,7 @@ class IdentityRemoveCachedAuthTokenFunction virtual ~IdentityRemoveCachedAuthTokenFunction(); // SyncExtensionFunction implementation: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class IdentityLaunchWebAuthFlowFunction : public ChromeAsyncExtensionFunction, @@ -337,12 +337,12 @@ class IdentityLaunchWebAuthFlowFunction : public ChromeAsyncExtensionFunction, private: virtual ~IdentityLaunchWebAuthFlowFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // WebAuthFlow::Delegate implementation. - virtual void OnAuthFlowFailure(WebAuthFlow::Failure failure) OVERRIDE; - virtual void OnAuthFlowURLChange(const GURL& redirect_url) OVERRIDE; - virtual void OnAuthFlowTitleChange(const std::string& title) OVERRIDE {} + virtual void OnAuthFlowFailure(WebAuthFlow::Failure failure) override; + virtual void OnAuthFlowURLChange(const GURL& redirect_url) override; + virtual void OnAuthFlowTitleChange(const std::string& title) override {} // Helper to initialize final URL prefix. void InitFinalRedirectURLPrefix(const std::string& extension_id); diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc index 47ff74c..f8de0ad 100644 --- a/chrome/browser/extensions/api/identity/identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc @@ -87,7 +87,7 @@ class SendResponseDelegate virtual void OnSendResponse(UIThreadExtensionFunction* function, bool success, - bool bad_message) OVERRIDE { + bool bad_message) override { ASSERT_FALSE(bad_message); ASSERT_FALSE(HasResponse()); response_.reset(new bool); @@ -164,7 +164,7 @@ class TestHangOAuth2MintTokenFlow : public OAuth2MintTokenFlow { TestHangOAuth2MintTokenFlow() : OAuth2MintTokenFlow(NULL, NULL, OAuth2MintTokenFlow::Parameters()) {} - virtual void Start() OVERRIDE { + virtual void Start() override { // Do nothing, simulating a hanging network call. } }; @@ -186,7 +186,7 @@ class TestOAuth2MintTokenFlow : public OAuth2MintTokenFlow { delegate_(delegate) { } - virtual void Start() OVERRIDE { + virtual void Start() override { switch (result_) { case ISSUE_ADVICE_SUCCESS: { IssueAdviceInfo info; @@ -236,7 +236,7 @@ class WaitForGURLAndCloseWindow : public content::WindowedNotificationObserver { // NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { content::NavigationController* web_auth_flow_controller = content::Source<content::NavigationController>(source).ptr(); content::WebContents* web_contents = @@ -316,7 +316,7 @@ class FakeGetAuthTokenFunction : public IdentityGetAuthTokenFunction { std::string login_access_token() const { return login_access_token_; } - virtual void StartLoginAccessTokenRequest() OVERRIDE { + virtual void StartLoginAccessTokenRequest() override { if (auto_login_access_token_) { if (login_access_token_result_) { OnGetTokenSuccess(login_token_request_.get(), @@ -334,7 +334,7 @@ class FakeGetAuthTokenFunction : public IdentityGetAuthTokenFunction { } } - virtual void ShowLoginPopup() OVERRIDE { + virtual void ShowLoginPopup() override { EXPECT_FALSE(login_ui_shown_); login_ui_shown_ = true; if (login_ui_result_) @@ -344,7 +344,7 @@ class FakeGetAuthTokenFunction : public IdentityGetAuthTokenFunction { } virtual void ShowOAuthApprovalDialog( - const IssueAdviceInfo& issue_advice) OVERRIDE { + const IssueAdviceInfo& issue_advice) override { scope_ui_shown_ = true; if (scope_ui_result_) { @@ -359,7 +359,7 @@ class FakeGetAuthTokenFunction : public IdentityGetAuthTokenFunction { } virtual OAuth2MintTokenFlow* CreateMintTokenFlow( - const std::string& login_access_token) OVERRIDE { + const std::string& login_access_token) override { EXPECT_TRUE(login_access_token_.empty()); // Save the login token used to create the flow so tests can see // what account was used. @@ -397,7 +397,7 @@ gaia::AccountIds CreateIds(std::string email, std::string obfid) { } class IdentityGetAccountsFunctionTest : public ExtensionBrowserTest { - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kExtensionsMultiAccount); } @@ -509,7 +509,7 @@ IN_PROC_BROWSER_TEST_F(IdentityGetAccountsFunctionTest, TwoAccountsSignedIn) { class IdentityOldProfilesGetAccountsFunctionTest : public IdentityGetAccountsFunctionTest { - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Don't add the multi-account switch that parent class would have. } }; @@ -598,12 +598,12 @@ IN_PROC_BROWSER_TEST_F(IdentityGetProfileUserInfoFunctionTest, class GetAuthTokenFunctionTest : public AsyncExtensionBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { AsyncExtensionBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kExtensionsMultiAccount); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { AsyncExtensionBrowserTest::SetUpInProcessBrowserTestFixture(); will_create_browser_context_services_subscription_ = @@ -627,7 +627,7 @@ class GetAuthTokenFunctionTest : public AsyncExtensionBrowserTest { context, &FakeAccountReconcilor::Build); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { AsyncExtensionBrowserTest::SetUpOnMainThread(); // Grab references to the fake signin manager and token service. @@ -1657,7 +1657,7 @@ IN_PROC_BROWSER_TEST_F(RemoveCachedAuthTokenFunctionTest, MatchingToken) { class LaunchWebAuthFlowFunctionTest : public AsyncExtensionBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { AsyncExtensionBrowserTest::SetUpCommandLine(command_line); // Reduce performance test variance by disabling background networking. command_line->AppendSwitch(switches::kDisableBackgroundNetworking); diff --git a/chrome/browser/extensions/api/identity/identity_signin_flow.h b/chrome/browser/extensions/api/identity/identity_signin_flow.h index 207e6b5..9a0d646 100644 --- a/chrome/browser/extensions/api/identity/identity_signin_flow.h +++ b/chrome/browser/extensions/api/identity/identity_signin_flow.h @@ -40,7 +40,7 @@ class IdentitySigninFlow : public OAuth2TokenService::Observer { void Start(); // OAuth2TokenService::Observer implementation: - virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE; + virtual void OnRefreshTokenAvailable(const std::string& account_id) override; private: Delegate* delegate_; diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.h b/chrome/browser/extensions/api/identity/web_auth_flow.h index 1225472..dccc5f0 100644 --- a/chrome/browser/extensions/api/identity/web_auth_flow.h +++ b/chrome/browser/extensions/api/identity/web_auth_flow.h @@ -92,31 +92,31 @@ class WebAuthFlow : public content::NotificationObserver, friend class ::WebAuthFlowTest; // ::AppWindowRegistry::Observer implementation. - virtual void OnAppWindowAdded(AppWindow* app_window) OVERRIDE; - virtual void OnAppWindowRemoved(AppWindow* app_window) OVERRIDE; + virtual void OnAppWindowAdded(AppWindow* app_window) override; + virtual void OnAppWindowRemoved(AppWindow* app_window) override; // NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // WebContentsObserver implementation. virtual void DidStopLoading(content::RenderViewHost* render_view_host) - OVERRIDE; + override; virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const content::FrameNavigateParams& params) OVERRIDE; - virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; + const content::FrameNavigateParams& params) override; + virtual void RenderProcessGone(base::TerminationStatus status) override; virtual void DidStartProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& validated_url, bool is_error_page, - bool is_iframe_srcdoc) OVERRIDE; + bool is_iframe_srcdoc) override; virtual void DidFailProvisionalLoad( content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code, - const base::string16& error_description) OVERRIDE; + const base::string16& error_description) override; void BeforeUrlLoaded(const GURL& url); void AfterUrlLoaded(); diff --git a/chrome/browser/extensions/api/identity_private/identity_private_api.h b/chrome/browser/extensions/api/identity_private/identity_private_api.h index 8256337..6a1460d 100644 --- a/chrome/browser/extensions/api/identity_private/identity_private_api.h +++ b/chrome/browser/extensions/api/identity_private/identity_private_api.h @@ -19,7 +19,7 @@ class IdentityPrivateGetStringsFunction : public SyncExtensionFunction { virtual ~IdentityPrivateGetStringsFunction(); // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: DISALLOW_COPY_AND_ASSIGN(IdentityPrivateGetStringsFunction); diff --git a/chrome/browser/extensions/api/idle/idle_api.h b/chrome/browser/extensions/api/idle/idle_api.h index 6e18f47..005cc7d 100644 --- a/chrome/browser/extensions/api/idle/idle_api.h +++ b/chrome/browser/extensions/api/idle/idle_api.h @@ -19,7 +19,7 @@ class IdleQueryStateFunction : public ChromeAsyncExtensionFunction { virtual ~IdleQueryStateFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void IdleStateCallback(IdleState state); @@ -35,7 +35,7 @@ class IdleSetDetectionIntervalFunction : public ChromeSyncExtensionFunction { virtual ~IdleSetDetectionIntervalFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/idle/idle_api_unittest.cc b/chrome/browser/extensions/api/idle/idle_api_unittest.cc index 82779fe..52edd52 100644 --- a/chrome/browser/extensions/api/idle/idle_api_unittest.cc +++ b/chrome/browser/extensions/api/idle/idle_api_unittest.cc @@ -44,9 +44,9 @@ class TestIdleProvider : public IdleManager::IdleTimeProvider { TestIdleProvider(); virtual ~TestIdleProvider(); virtual void CalculateIdleState(int idle_threshold, - IdleCallback notify) OVERRIDE; - virtual void CalculateIdleTime(IdleTimeCallback notify) OVERRIDE; - virtual bool CheckIdleStateIsLocked() OVERRIDE; + IdleCallback notify) override; + virtual void CalculateIdleTime(IdleTimeCallback notify) override; + virtual bool CheckIdleStateIsLocked() override; void set_idle_time(int idle_time); void set_locked(bool locked); @@ -126,7 +126,7 @@ KeyedService* IdleManagerTestFactory(content::BrowserContext* profile) { class IdleTest : public ExtensionApiUnittest { public: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; protected: IdleManager* idle_manager_; diff --git a/chrome/browser/extensions/api/idle/idle_manager.cc b/chrome/browser/extensions/api/idle/idle_manager.cc index 31f465d..6d44958 100644 --- a/chrome/browser/extensions/api/idle/idle_manager.cc +++ b/chrome/browser/extensions/api/idle/idle_manager.cc @@ -31,9 +31,9 @@ class DefaultEventDelegate : public IdleManager::EventDelegate { virtual ~DefaultEventDelegate(); virtual void OnStateChanged(const std::string& extension_id, - IdleState new_state) OVERRIDE; - virtual void RegisterObserver(EventRouter::Observer* observer) OVERRIDE; - virtual void UnregisterObserver(EventRouter::Observer* observer) OVERRIDE; + IdleState new_state) override; + virtual void RegisterObserver(EventRouter::Observer* observer) override; + virtual void UnregisterObserver(EventRouter::Observer* observer) override; private: Profile* profile_; @@ -73,9 +73,9 @@ class DefaultIdleProvider : public IdleManager::IdleTimeProvider { virtual ~DefaultIdleProvider(); virtual void CalculateIdleState(int idle_threshold, - IdleCallback notify) OVERRIDE; - virtual void CalculateIdleTime(IdleTimeCallback notify) OVERRIDE; - virtual bool CheckIdleStateIsLocked() OVERRIDE; + IdleCallback notify) override; + virtual void CalculateIdleTime(IdleTimeCallback notify) override; + virtual bool CheckIdleStateIsLocked() override; }; DefaultIdleProvider::DefaultIdleProvider() { diff --git a/chrome/browser/extensions/api/idle/idle_manager.h b/chrome/browser/extensions/api/idle/idle_manager.h index 29a9bd1..8e96e27 100644 --- a/chrome/browser/extensions/api/idle/idle_manager.h +++ b/chrome/browser/extensions/api/idle/idle_manager.h @@ -74,17 +74,17 @@ class IdleManager : public ExtensionRegistryObserver, void Init(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // ExtensionRegistryObserver implementation. virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // EventRouter::Observer implementation. - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; - virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; + virtual void OnListenerRemoved(const EventListenerInfo& details) override; void QueryState(int threshold, QueryStateCallback notify); void SetThreshold(const std::string& extension_id, int threshold); diff --git a/chrome/browser/extensions/api/idle/idle_manager_factory.h b/chrome/browser/extensions/api/idle/idle_manager_factory.h index 1a9f9b7..ac4d005 100644 --- a/chrome/browser/extensions/api/idle/idle_manager_factory.h +++ b/chrome/browser/extensions/api/idle/idle_manager_factory.h @@ -27,11 +27,11 @@ class IdleManagerFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedBaseFactory implementation. virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/idltest/idltest_api.h b/chrome/browser/extensions/api/idltest/idltest_api.h index 5f93937..19f6156 100644 --- a/chrome/browser/extensions/api/idltest/idltest_api.h +++ b/chrome/browser/extensions/api/idltest/idltest_api.h @@ -13,7 +13,7 @@ class IdltestSendArrayBufferFunction : public SyncExtensionFunction { protected: virtual ~IdltestSendArrayBufferFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class IdltestSendArrayBufferViewFunction : public SyncExtensionFunction { @@ -23,7 +23,7 @@ class IdltestSendArrayBufferViewFunction : public SyncExtensionFunction { protected: virtual ~IdltestSendArrayBufferViewFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class IdltestGetArrayBufferFunction : public SyncExtensionFunction { @@ -32,7 +32,7 @@ class IdltestGetArrayBufferFunction : public SyncExtensionFunction { protected: virtual ~IdltestGetArrayBufferFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; #endif // CHROME_BROWSER_EXTENSIONS_API_IDLTEST_IDLTEST_API_H_ diff --git a/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.h b/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.h index 1ad44b7..7d9a026 100644 --- a/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.h +++ b/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.h @@ -20,7 +20,7 @@ class DestroyPartitionsOperation : public Operation { DestroyPartitionsOperation(base::WeakPtr<OperationManager> manager, const ExtensionId& extension_id, const std::string& storage_unit_id); - virtual void StartImpl() OVERRIDE; + virtual void StartImpl() override; private: virtual ~DestroyPartitionsOperation(); diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.h b/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.h index 56ee446..e55150c 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.h +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.h @@ -19,7 +19,7 @@ class ImageWriterPrivateWriteFromUrlFunction private: virtual ~ImageWriterPrivateWriteFromUrlFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void OnWriteStarted(bool success, const std::string& error); }; @@ -32,7 +32,7 @@ class ImageWriterPrivateWriteFromFileFunction private: virtual ~ImageWriterPrivateWriteFromFileFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void OnWriteStarted(bool success, const std::string& error); }; @@ -45,7 +45,7 @@ class ImageWriterPrivateCancelWriteFunction private: virtual ~ImageWriterPrivateCancelWriteFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void OnWriteCancelled(bool success, const std::string& error); }; @@ -58,7 +58,7 @@ class ImageWriterPrivateDestroyPartitionsFunction private: virtual ~ImageWriterPrivateDestroyPartitionsFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void OnDestroyComplete(bool success, const std::string& error); }; @@ -71,7 +71,7 @@ class ImageWriterPrivateListRemovableStorageDevicesFunction private: virtual ~ImageWriterPrivateListRemovableStorageDevicesFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void OnDeviceListReady(scoped_refptr<StorageDeviceList> device_list, bool success); }; diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc b/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc index f30c38cc..9ba749a 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc @@ -18,7 +18,7 @@ using extensions::image_writer::FakeImageWriterClient; class ImageWriterPrivateApiTest : public ExtensionApiTest { public: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); test_utils_.SetUp(true); @@ -61,7 +61,7 @@ class ImageWriterPrivateApiTest : public ExtensionApiTest { RemovableStorageProvider::SetDeviceListForTesting(device_list); } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { ExtensionApiTest::TearDownInProcessBrowserTestFixture(); test_utils_.TearDown(); RemovableStorageProvider::ClearDeviceListForTesting(); diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h index 81408ff..215a77d 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h @@ -61,9 +61,9 @@ class ImageWriterUtilityClient : public content::UtilityProcessHostClient { void StartHost(); // UtilityProcessHostClient implementation. - virtual void OnProcessCrashed(int exit_code) OVERRIDE; - virtual void OnProcessLaunchFailed() OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnProcessCrashed(int exit_code) override; + virtual void OnProcessLaunchFailed() override; + virtual bool OnMessageReceived(const IPC::Message& message) override; virtual bool Send(IPC::Message* msg); // IPC message handlers. diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager.h b/chrome/browser/extensions/api/image_writer_private/operation_manager.h index 8d9208f..95ebfeb 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_manager.h +++ b/chrome/browser/extensions/api/image_writer_private/operation_manager.h @@ -49,7 +49,7 @@ class OperationManager : public BrowserContextKeyedAPI, explicit OperationManager(content::BrowserContext* context); virtual ~OperationManager(); - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // Starts a WriteFromUrl operation. void StartWriteFromUrl(const ExtensionId& extension_id, @@ -99,13 +99,13 @@ class OperationManager : public BrowserContextKeyedAPI, // NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // ExtensionRegistryObserver implementation. virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; Operation* GetOperation(const ExtensionId& extension_id); void DeleteOperation(const ExtensionId& extension_id); diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc b/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc index 3bd5200..243048f 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc @@ -29,7 +29,7 @@ class FakeEventRouter : public extensions::EventRouter { virtual void DispatchEventToExtension( const std::string& extension_id, - scoped_ptr<extensions::Event> event) OVERRIDE { + scoped_ptr<extensions::Event> event) override { // Do nothing with the event as no tests currently care. } }; @@ -42,7 +42,7 @@ class FakeExtensionSystem : public extensions::TestExtensionSystem { fake_event_router_.reset(new FakeEventRouter(profile)); } - virtual EventRouter* event_router() OVERRIDE { + virtual EventRouter* event_router() override { return fake_event_router_.get(); } @@ -77,7 +77,7 @@ class ImageWriterOperationManagerTest : public ImageWriterUnitTestBase { start_success_(false) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ImageWriterUnitTestBase::SetUp(); extension_system_ = static_cast<FakeExtensionSystem*>( ExtensionSystemFactory::GetInstance()-> diff --git a/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc index 9dc7c0c..e293236 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc @@ -37,7 +37,7 @@ class OperationForTest : public Operation { const std::string& device_path) : Operation(manager_, extension_id, device_path) {} - virtual void StartImpl() OVERRIDE {} + virtual void StartImpl() override {} // Expose internal stages for testing. void Unzip(const base::Closure& continuation) { @@ -67,7 +67,7 @@ class ImageWriterOperationTest : public ImageWriterUnitTestBase { protected: ImageWriterOperationTest() : profile_(new TestingProfile), manager_(profile_.get()) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ImageWriterUnitTestBase::SetUp(); // Create the zip file. @@ -88,7 +88,7 @@ class ImageWriterOperationTest : public ImageWriterUnitTestBase { operation_->SetImagePath(test_utils_.GetImagePath()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Ensure all callbacks have been destroyed and cleanup occurs. operation_->Cancel(); diff --git a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc index a498178..d4de7d9 100644 --- a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc @@ -31,13 +31,13 @@ const char kUnknownUSBDiskModel[] = "USB Drive"; class RemovableStorageProviderChromeOsUnitTest : public testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { disk_mount_manager_mock_ = new MockDiskMountManager(); DiskMountManager::InitializeForTesting(disk_mount_manager_mock_); disk_mount_manager_mock_->SetupDefaultReplies(); } - virtual void TearDown() OVERRIDE { DiskMountManager::Shutdown(); } + virtual void TearDown() override { DiskMountManager::Shutdown(); } void DevicesCallback(scoped_refptr<StorageDeviceList> devices, bool success) { devices_ = devices; diff --git a/chrome/browser/extensions/api/image_writer_private/test_utils.cc b/chrome/browser/extensions/api/image_writer_private/test_utils.cc index 5cae145..7ef5bee 100644 --- a/chrome/browser/extensions/api/image_writer_private/test_utils.cc +++ b/chrome/browser/extensions/api/image_writer_private/test_utils.cc @@ -23,14 +23,14 @@ class ImageWriterFakeImageBurnerClient virtual void SetEventHandlers( const BurnFinishedHandler& burn_finished_handler, - const BurnProgressUpdateHandler& burn_progress_update_handler) OVERRIDE { + const BurnProgressUpdateHandler& burn_progress_update_handler) override { burn_finished_handler_ = burn_finished_handler; burn_progress_update_handler_ = burn_progress_update_handler; } virtual void BurnImage(const std::string& from_path, const std::string& to_path, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(burn_progress_update_handler_, to_path, 0, 100)); base::MessageLoop::current()->PostTask(FROM_HERE, diff --git a/chrome/browser/extensions/api/image_writer_private/test_utils.h b/chrome/browser/extensions/api/image_writer_private/test_utils.h index 9564602..b4b7e7c6 100644 --- a/chrome/browser/extensions/api/image_writer_private/test_utils.h +++ b/chrome/browser/extensions/api/image_writer_private/test_utils.h @@ -64,7 +64,7 @@ class FakeDiskMountManager : public chromeos::disks::MockDiskMountManager { virtual void UnmountDeviceRecursively( const std::string& device_path, - const UnmountDeviceRecursivelyCallbackType& callback) OVERRIDE; + const UnmountDeviceRecursivelyCallbackType& callback) override; private: DiskMap disks_; @@ -79,17 +79,17 @@ class FakeImageWriterClient : public ImageWriterUtilityClient { const SuccessCallback& success_callback, const ErrorCallback& error_callback, const base::FilePath& source, - const base::FilePath& target) OVERRIDE; + const base::FilePath& target) override; virtual void Verify(const ProgressCallback& progress_callback, const SuccessCallback& success_callback, const ErrorCallback& error_callback, const base::FilePath& source, - const base::FilePath& target) OVERRIDE; + const base::FilePath& target) override; - virtual void Cancel(const CancelCallback& cancel_callback) OVERRIDE; + virtual void Cancel(const CancelCallback& cancel_callback) override; - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // Sets a callback for when a Write call is made. void SetWriteCallback(const base::Closure& write_callback); @@ -169,8 +169,8 @@ class ImageWriterUnitTestBase : public testing::Test { ImageWriterUnitTestBase(); virtual ~ImageWriterUnitTestBase(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; ImageWriterTestUtils test_utils_; diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.h b/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.h index 312fd8e..49ea47a 100644 --- a/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.h +++ b/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.h @@ -17,7 +17,7 @@ class WriteFromFileOperation : public Operation { const ExtensionId& extension_id, const base::FilePath& user_file_path, const std::string& storage_unit_id); - virtual void StartImpl() OVERRIDE; + virtual void StartImpl() override; private: virtual ~WriteFromFileOperation(); diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.h b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.h index 2668321..0b7ac73d 100644 --- a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.h +++ b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.h @@ -28,7 +28,7 @@ class WriteFromUrlOperation : public Operation, public net::URLFetcherDelegate { GURL url, const std::string& hash, const std::string& storage_unit_id); - virtual void StartImpl() OVERRIDE; + virtual void StartImpl() override; protected: virtual ~WriteFromUrlOperation(); @@ -51,13 +51,13 @@ class WriteFromUrlOperation : public Operation, public net::URLFetcherDelegate { void DestroyUrlFetcher(); // URLFetcherDelegate implementation. - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source, int64 current, - int64 total) OVERRIDE; + int64 total) override; virtual void OnURLFetchUploadProgress(const net::URLFetcher* source, int64 current, - int64 total) OVERRIDE; + int64 total) override; void VerifyDownloadCompare(const base::Closure& continuation, const std::string& download_hash); diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc index 7be001c..815be78 100644 --- a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc @@ -43,7 +43,7 @@ class OperationForTest : public WriteFromUrlOperation { hash, storage_unit_id) {} - virtual void StartImpl() OVERRIDE {} + virtual void StartImpl() override {} // Expose stages for testing. void GetDownloadTarget(const base::Closure& continuation) { @@ -73,7 +73,7 @@ class ImageWriterWriteFromUrlOperationTest : public ImageWriterUnitTestBase { protected: ImageWriterWriteFromUrlOperationTest() : manager_(&test_profile_) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ImageWriterUnitTestBase::SetUp(); // Turn on interception and set up our dummy file. @@ -86,7 +86,7 @@ class ImageWriterWriteFromUrlOperationTest : public ImageWriterUnitTestBase { test_utils_.GetImagePath()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { ImageWriterUnitTestBase::TearDown(); // Remember to turn off global interception. diff --git a/chrome/browser/extensions/api/input/input.h b/chrome/browser/extensions/api/input/input.h index da9e962..9cf8888 100644 --- a/chrome/browser/extensions/api/input/input.h +++ b/chrome/browser/extensions/api/input/input.h @@ -24,7 +24,7 @@ class VirtualKeyboardPrivateInsertTextFunction : public SyncExtensionFunction { virtual ~VirtualKeyboardPrivateInsertTextFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class VirtualKeyboardPrivateMoveCursorFunction : public SyncExtensionFunction { @@ -36,7 +36,7 @@ class VirtualKeyboardPrivateMoveCursorFunction : public SyncExtensionFunction { virtual ~VirtualKeyboardPrivateMoveCursorFunction() {} // ExtensionFunction. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class VirtualKeyboardPrivateSendKeyEventFunction @@ -50,7 +50,7 @@ class VirtualKeyboardPrivateSendKeyEventFunction virtual ~VirtualKeyboardPrivateSendKeyEventFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class VirtualKeyboardPrivateHideKeyboardFunction @@ -64,7 +64,7 @@ class VirtualKeyboardPrivateHideKeyboardFunction virtual ~VirtualKeyboardPrivateHideKeyboardFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class VirtualKeyboardPrivateLockKeyboardFunction @@ -78,7 +78,7 @@ class VirtualKeyboardPrivateLockKeyboardFunction virtual ~VirtualKeyboardPrivateLockKeyboardFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class VirtualKeyboardPrivateKeyboardLoadedFunction @@ -92,7 +92,7 @@ class VirtualKeyboardPrivateKeyboardLoadedFunction virtual ~VirtualKeyboardPrivateKeyboardLoadedFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class VirtualKeyboardPrivateGetKeyboardConfigFunction @@ -106,7 +106,7 @@ class VirtualKeyboardPrivateGetKeyboardConfigFunction virtual ~VirtualKeyboardPrivateGetKeyboardConfigFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class VirtualKeyboardPrivateOpenSettingsFunction @@ -119,7 +119,7 @@ class VirtualKeyboardPrivateOpenSettingsFunction virtual ~VirtualKeyboardPrivateOpenSettingsFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.cc b/chrome/browser/extensions/api/input_ime/input_ime_api.cc index 4ca34ae..40c27bd 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc +++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc @@ -104,7 +104,7 @@ class ImeObserver : public InputMethodEngineInterface::Observer { virtual ~ImeObserver() {} - virtual void OnActivate(const std::string& component_id) OVERRIDE { + virtual void OnActivate(const std::string& component_id) override { if (extension_id_.empty()) return; @@ -116,7 +116,7 @@ class ImeObserver : public InputMethodEngineInterface::Observer { extension_id_, input_ime::OnActivate::kEventName, args.Pass()); } - virtual void OnDeactivated(const std::string& component_id) OVERRIDE { + virtual void OnDeactivated(const std::string& component_id) override { if (extension_id_.empty()) return; @@ -128,7 +128,7 @@ class ImeObserver : public InputMethodEngineInterface::Observer { } virtual void OnFocus( - const InputMethodEngineInterface::InputContext& context) OVERRIDE { + const InputMethodEngineInterface::InputContext& context) override { if (extension_id_.empty()) return; @@ -142,7 +142,7 @@ class ImeObserver : public InputMethodEngineInterface::Observer { extension_id_, input_ime::OnFocus::kEventName, args.Pass()); } - virtual void OnBlur(int context_id) OVERRIDE { + virtual void OnBlur(int context_id) override { if (extension_id_.empty()) return; @@ -153,7 +153,7 @@ class ImeObserver : public InputMethodEngineInterface::Observer { } virtual void OnInputContextUpdate( - const InputMethodEngineInterface::InputContext& context) OVERRIDE { + const InputMethodEngineInterface::InputContext& context) override { if (extension_id_.empty()) return; @@ -172,7 +172,7 @@ class ImeObserver : public InputMethodEngineInterface::Observer { virtual void OnKeyEvent( const std::string& component_id, const InputMethodEngineInterface::KeyboardEvent& event, - chromeos::input_method::KeyEventHandle* key_data) OVERRIDE { + chromeos::input_method::KeyEventHandle* key_data) override { if (extension_id_.empty()) return; @@ -213,7 +213,7 @@ class ImeObserver : public InputMethodEngineInterface::Observer { virtual void OnCandidateClicked( const std::string& component_id, int candidate_id, - InputMethodEngineInterface::MouseButtonEvent button) OVERRIDE { + InputMethodEngineInterface::MouseButtonEvent button) override { if (extension_id_.empty()) return; @@ -243,7 +243,7 @@ class ImeObserver : public InputMethodEngineInterface::Observer { } virtual void OnMenuItemActivated(const std::string& component_id, - const std::string& menu_id) OVERRIDE { + const std::string& menu_id) override { if (extension_id_.empty()) return; @@ -257,7 +257,7 @@ class ImeObserver : public InputMethodEngineInterface::Observer { virtual void OnSurroundingTextChanged(const std::string& component_id, const std::string& text, int cursor_pos, - int anchor_pos) OVERRIDE { + int anchor_pos) override { if (extension_id_.empty()) return; @@ -273,7 +273,7 @@ class ImeObserver : public InputMethodEngineInterface::Observer { args.Pass()); } - virtual void OnReset(const std::string& component_id) OVERRIDE { + virtual void OnReset(const std::string& component_id) override { if (extension_id_.empty()) return; diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.h b/chrome/browser/extensions/api/input_ime/input_ime_api.h index 76d7853..b55260104 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api.h +++ b/chrome/browser/extensions/api/input_ime/input_ime_api.h @@ -83,7 +83,7 @@ class InputImeSetCompositionFunction : public SyncExtensionFunction { virtual ~InputImeSetCompositionFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class InputImeClearCompositionFunction : public SyncExtensionFunction { @@ -95,7 +95,7 @@ class InputImeClearCompositionFunction : public SyncExtensionFunction { virtual ~InputImeClearCompositionFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class InputImeCommitTextFunction : public SyncExtensionFunction { @@ -106,7 +106,7 @@ class InputImeCommitTextFunction : public SyncExtensionFunction { virtual ~InputImeCommitTextFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class InputImeSetCandidateWindowPropertiesFunction @@ -119,7 +119,7 @@ class InputImeSetCandidateWindowPropertiesFunction virtual ~InputImeSetCandidateWindowPropertiesFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class InputImeSetCandidatesFunction : public SyncExtensionFunction { @@ -130,7 +130,7 @@ class InputImeSetCandidatesFunction : public SyncExtensionFunction { virtual ~InputImeSetCandidatesFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class InputImeSetCursorPositionFunction : public SyncExtensionFunction { @@ -142,7 +142,7 @@ class InputImeSetCursorPositionFunction : public SyncExtensionFunction { virtual ~InputImeSetCursorPositionFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class InputImeSetMenuItemsFunction : public SyncExtensionFunction { @@ -153,7 +153,7 @@ class InputImeSetMenuItemsFunction : public SyncExtensionFunction { virtual ~InputImeSetMenuItemsFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class InputImeUpdateMenuItemsFunction : public SyncExtensionFunction { @@ -165,7 +165,7 @@ class InputImeUpdateMenuItemsFunction : public SyncExtensionFunction { virtual ~InputImeUpdateMenuItemsFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class InputImeDeleteSurroundingTextFunction : public SyncExtensionFunction { @@ -176,7 +176,7 @@ class InputImeDeleteSurroundingTextFunction : public SyncExtensionFunction { virtual ~InputImeDeleteSurroundingTextFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class InputImeKeyEventHandledFunction : public AsyncExtensionFunction { @@ -188,7 +188,7 @@ class InputImeKeyEventHandledFunction : public AsyncExtensionFunction { virtual ~InputImeKeyEventHandledFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class InputImeSendKeyEventsFunction : public AsyncExtensionFunction { @@ -200,7 +200,7 @@ class InputImeSendKeyEventsFunction : public AsyncExtensionFunction { virtual ~InputImeSendKeyEventsFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class InputImeHideInputViewFunction : public AsyncExtensionFunction { @@ -212,7 +212,7 @@ class InputImeHideInputViewFunction : public AsyncExtensionFunction { virtual ~InputImeHideInputViewFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class InputImeAPI : public BrowserContextKeyedAPI, @@ -227,14 +227,14 @@ class InputImeAPI : public BrowserContextKeyedAPI, // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // EventRouter::Observer implementation. - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; private: friend class BrowserContextKeyedAPIFactory<InputImeAPI>; diff --git a/chrome/browser/extensions/api/location/location_api.h b/chrome/browser/extensions/api/location/location_api.h index 570abaed..bfdbcc4d11 100644 --- a/chrome/browser/extensions/api/location/location_api.h +++ b/chrome/browser/extensions/api/location/location_api.h @@ -18,7 +18,7 @@ class LocationWatchLocationFunction : public ChromeSyncExtensionFunction { virtual ~LocationWatchLocationFunction() {} // SyncExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class LocationClearWatchFunction : public ChromeSyncExtensionFunction { @@ -30,7 +30,7 @@ class LocationClearWatchFunction : public ChromeSyncExtensionFunction { virtual ~LocationClearWatchFunction() {} // SyncExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/location/location_manager.cc b/chrome/browser/extensions/api/location/location_manager.cc index ee23184..3b5b985 100644 --- a/chrome/browser/extensions/api/location/location_manager.cc +++ b/chrome/browser/extensions/api/location/location_manager.cc @@ -58,7 +58,7 @@ class DistanceBasedUpdatePolicy : public UpdatePolicy { // UpdatePolicy Implementation virtual bool ShouldSendUpdate(const content::Geoposition& position) const - OVERRIDE { + override { return !last_updated_position_.Validate() || Distance(position.latitude, position.longitude, @@ -68,7 +68,7 @@ class DistanceBasedUpdatePolicy : public UpdatePolicy { } virtual void OnPositionReported(const content::Geoposition& position) - OVERRIDE { + override { last_updated_position_ = position; } @@ -117,12 +117,12 @@ class TimeBasedUpdatePolicy : public UpdatePolicy { {} // UpdatePolicy Implementation - virtual bool ShouldSendUpdate(const content::Geoposition&) const OVERRIDE { + virtual bool ShouldSendUpdate(const content::Geoposition&) const override { return (base::Time::Now() - last_update_time_).InMilliseconds() > time_between_updates_ms_; } - virtual void OnPositionReported(const content::Geoposition&) OVERRIDE { + virtual void OnPositionReported(const content::Geoposition&) override { last_update_time_ = base::Time::Now(); } diff --git a/chrome/browser/extensions/api/location/location_manager.h b/chrome/browser/extensions/api/location/location_manager.h index 774946b..24bb38b 100644 --- a/chrome/browser/extensions/api/location/location_manager.h +++ b/chrome/browser/extensions/api/location/location_manager.h @@ -78,11 +78,11 @@ class LocationManager : public BrowserContextKeyedAPI, // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // BrowserContextKeyedAPI implementation. static const char* service_name() { return "LocationManager"; } diff --git a/chrome/browser/extensions/api/log_private/log_private_api.h b/chrome/browser/extensions/api/log_private/log_private_api.h index 95181f9..31000e6 100644 --- a/chrome/browser/extensions/api/log_private/log_private_api.h +++ b/chrome/browser/extensions/api/log_private/log_private_api.h @@ -38,7 +38,7 @@ class FileResource : public ApiResource { virtual ~FileResource(); // ApiResource overrides. - virtual bool IsPersistent() const OVERRIDE; + virtual bool IsPersistent() const override; static const char kSequenceToken[]; static const base::SequencedWorkerPool::WorkerShutdown kShutdownBehavior = @@ -81,10 +81,10 @@ class LogPrivateAPI : public BrowserContextKeyedAPI, virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // ChromeNetLog::ThreadSafeObserver implementation: - virtual void OnAddEntry(const net::NetLog::Entry& entry) OVERRIDE; + virtual void OnAddEntry(const net::NetLog::Entry& entry) override; void PostPendingEntries(); void AddEntriesOnUI(scoped_ptr<base::ListValue> value); @@ -134,7 +134,7 @@ class LogPrivateGetHistoricalFunction : public AsyncExtensionFunction { protected: virtual ~LogPrivateGetHistoricalFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnSystemLogsLoaded(scoped_ptr<system_logs::SystemLogsResponse> sys_info); @@ -152,7 +152,7 @@ class LogPrivateStartEventRecorderFunction : public AsyncExtensionFunction { protected: virtual ~LogPrivateStartEventRecorderFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnEventRecorderStarted(); @@ -170,7 +170,7 @@ class LogPrivateStopEventRecorderFunction : public AsyncExtensionFunction { virtual ~LogPrivateStopEventRecorderFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnEventRecorderStopped(); @@ -187,7 +187,7 @@ class LogPrivateDumpLogsFunction : public AsyncExtensionFunction { virtual ~LogPrivateDumpLogsFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Callback for DebugLogWriter::StoreLogs() call. diff --git a/chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc b/chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc index 316a621..b8500e9 100644 --- a/chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc +++ b/chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc @@ -33,7 +33,7 @@ class TestDebugDaemonClient : public chromeos::FakeDebugDaemonClient { virtual void DumpDebugLogs(bool is_compressed, base::File file, scoped_refptr<base::TaskRunner> task_runner, - const GetDebugLogsCallback& callback) OVERRIDE { + const GetDebugLogsCallback& callback) override { base::File* file_param = new base::File(file.Pass()); task_runner->PostTaskAndReply( FROM_HERE, @@ -67,7 +67,7 @@ class LogPrivateApiTest : public ExtensionApiTest { virtual ~LogPrivateApiTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { base::FilePath tar_file_path = test_data_dir_.Append("log_private/dump_logs/system_logs.tar"); chromeos::DBusThreadManager::GetSetterForTesting()->SetDebugDaemonClient( diff --git a/chrome/browser/extensions/api/log_private/syslog_parser.h b/chrome/browser/extensions/api/log_private/syslog_parser.h index b746334..ccd478b 100644 --- a/chrome/browser/extensions/api/log_private/syslog_parser.h +++ b/chrome/browser/extensions/api/log_private/syslog_parser.h @@ -26,7 +26,7 @@ class SyslogParser : public LogParser { const std::string& input, std::vector<linked_ptr<api::log_private::LogEntry> >* output, FilterHandler* filter_handler) const - OVERRIDE; + override; private: // Parses time token and get time in milliseconds. diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc index f2cf45f..2b98537 100644 --- a/chrome/browser/extensions/api/management/management_api.cc +++ b/chrome/browser/extensions/api/management/management_api.cc @@ -379,7 +379,7 @@ class SafeManifestJSONParser : public UtilityProcessHostClient { host->Send(new ChromeUtilityMsg_ParseJSON(manifest_)); } - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { bool handled = true; IPC_BEGIN_MESSAGE_MAP(SafeManifestJSONParser, message) IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Succeeded, diff --git a/chrome/browser/extensions/api/management/management_api.h b/chrome/browser/extensions/api/management/management_api.h index 9a66536..ff8ea11 100644 --- a/chrome/browser/extensions/api/management/management_api.h +++ b/chrome/browser/extensions/api/management/management_api.h @@ -47,7 +47,7 @@ class ManagementGetAllFunction : public ManagementFunction { virtual ~ManagementGetAllFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ManagementGetFunction : public ManagementFunction { @@ -58,7 +58,7 @@ class ManagementGetFunction : public ManagementFunction { virtual ~ManagementGetFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ManagementGetSelfFunction : public ManagementFunction { @@ -69,7 +69,7 @@ class ManagementGetSelfFunction : public ManagementFunction { virtual ~ManagementGetSelfFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ManagementGetPermissionWarningsByIdFunction : public ManagementFunction { @@ -81,7 +81,7 @@ class ManagementGetPermissionWarningsByIdFunction : public ManagementFunction { virtual ~ManagementGetPermissionWarningsByIdFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ManagementGetPermissionWarningsByManifestFunction @@ -99,7 +99,7 @@ class ManagementGetPermissionWarningsByManifestFunction virtual ~ManagementGetPermissionWarningsByManifestFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class ManagementLaunchAppFunction : public ManagementFunction { @@ -110,7 +110,7 @@ class ManagementLaunchAppFunction : public ManagementFunction { virtual ~ManagementLaunchAppFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ManagementSetEnabledFunction : public AsyncManagementFunction, @@ -124,11 +124,11 @@ class ManagementSetEnabledFunction : public AsyncManagementFunction, virtual ~ManagementSetEnabledFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // ExtensionInstallPrompt::Delegate. - virtual void InstallUIProceed() OVERRIDE; - virtual void InstallUIAbort(bool user_initiated) OVERRIDE; + virtual void InstallUIProceed() override; + virtual void InstallUIAbort(bool user_initiated) override; private: std::string extension_id_; @@ -145,8 +145,8 @@ class ManagementUninstallFunctionBase : public AsyncManagementFunction, static void SetAutoConfirmForTest(bool should_proceed); // ExtensionUninstallDialog::Delegate implementation. - virtual void ExtensionUninstallAccepted() OVERRIDE; - virtual void ExtensionUninstallCanceled() OVERRIDE; + virtual void ExtensionUninstallAccepted() override; + virtual void ExtensionUninstallCanceled() override; protected: virtual ~ManagementUninstallFunctionBase(); @@ -172,7 +172,7 @@ class ManagementUninstallFunction : public ManagementUninstallFunctionBase { private: virtual ~ManagementUninstallFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class ManagementUninstallSelfFunction : public ManagementUninstallFunctionBase { @@ -185,7 +185,7 @@ class ManagementUninstallSelfFunction : public ManagementUninstallFunctionBase { private: virtual ~ManagementUninstallSelfFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class ManagementCreateAppShortcutFunction : public AsyncManagementFunction { @@ -202,7 +202,7 @@ class ManagementCreateAppShortcutFunction : public AsyncManagementFunction { protected: virtual ~ManagementCreateAppShortcutFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class ManagementSetLaunchTypeFunction : public ManagementFunction { @@ -213,7 +213,7 @@ class ManagementSetLaunchTypeFunction : public ManagementFunction { protected: virtual ~ManagementSetLaunchTypeFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ManagementGenerateAppForLinkFunction : public AsyncManagementFunction { @@ -226,7 +226,7 @@ class ManagementGenerateAppForLinkFunction : public AsyncManagementFunction { protected: virtual ~ManagementGenerateAppForLinkFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnFaviconForApp(const favicon_base::FaviconImageResult& image_result); @@ -250,18 +250,18 @@ class ManagementEventRouter : public ExtensionRegistryObserver { private: // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) 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; // Dispatches management api events to listening extensions. void BroadcastEvent(const Extension* extension, const char* event_name); @@ -281,13 +281,13 @@ class ManagementAPI : public BrowserContextKeyedAPI, virtual ~ManagementAPI(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<ManagementAPI>* GetFactoryInstance(); // EventRouter::Observer implementation. - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; private: friend class BrowserContextKeyedAPIFactory<ManagementAPI>; diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc index 3b31c6e..4b31cef 100644 --- a/chrome/browser/extensions/api/management/management_api_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc @@ -215,7 +215,7 @@ class ExtensionManagementApiEscalationTest : // The id of the permissions escalation test extension we use. static const char kId[]; - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { EXPECT_TRUE(scoped_temp_dir_.CreateUniqueTempDir()); base::FilePath pem_path = test_data_dir_. AppendASCII("permissions_increase").AppendASCII("permissions.pem"); diff --git a/chrome/browser/extensions/api/management/management_apitest.cc b/chrome/browser/extensions/api/management/management_apitest.cc index 4be0a3e..6b8623f 100644 --- a/chrome/browser/extensions/api/management/management_apitest.cc +++ b/chrome/browser/extensions/api/management/management_apitest.cc @@ -43,7 +43,7 @@ Browser* FindOtherBrowser(Browser* browser) { class ExtensionManagementApiTest : public ExtensionApiTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnablePanels); } @@ -335,7 +335,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchType) { class ExtensionManagementApiStreamlinedAppsTest : public ExtensionManagementApiTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionManagementApiTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnableStreamlinedHostedApps); } diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc index 7ba688f..4c4628a 100644 --- a/chrome/browser/extensions/api/management/management_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_browsertest.cc @@ -56,7 +56,7 @@ std::string BuildForceInstallPolicyValue(const char* extension_id, class ExtensionManagementTest : public ExtensionBrowserTest { public: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { EXPECT_CALL(policy_provider_, IsInitializationComplete(_)) .WillRepeatedly(Return(true)); policy::BrowserPolicyConnector::SetPolicyProviderForTesting( @@ -233,7 +233,7 @@ class NotificationListener : public content::NotificationObserver { // Implements content::NotificationObserver interface. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { switch (type) { case extensions::NOTIFICATION_EXTENSION_UPDATING_STARTED: { EXPECT_FALSE(started_); diff --git a/chrome/browser/extensions/api/mdns/dns_sd_device_lister.h b/chrome/browser/extensions/api/mdns/dns_sd_device_lister.h index 060af2f..6e0053c 100644 --- a/chrome/browser/extensions/api/mdns/dns_sd_device_lister.h +++ b/chrome/browser/extensions/api/mdns/dns_sd_device_lister.h @@ -32,9 +32,9 @@ class DnsSdDeviceLister protected: virtual void OnDeviceChanged( bool added, - const local_discovery::ServiceDescription& service_description) OVERRIDE; - virtual void OnDeviceRemoved(const std::string& service_name) OVERRIDE; - virtual void OnDeviceCacheFlushed() OVERRIDE; + const local_discovery::ServiceDescription& service_description) override; + virtual void OnDeviceRemoved(const std::string& service_name) override; + virtual void OnDeviceCacheFlushed() override; private: // The delegate to notify of changes to services. diff --git a/chrome/browser/extensions/api/mdns/dns_sd_registry.h b/chrome/browser/extensions/api/mdns/dns_sd_registry.h index e3d59d8..e6dc922 100644 --- a/chrome/browser/extensions/api/mdns/dns_sd_registry.h +++ b/chrome/browser/extensions/api/mdns/dns_sd_registry.h @@ -91,10 +91,10 @@ class DnsSdRegistry : public DnsSdDelegate { // DnsSdDelegate implementation: virtual void ServiceChanged(const std::string& service_type, bool added, - const DnsSdService& service) OVERRIDE; + const DnsSdService& service) override; virtual void ServiceRemoved(const std::string& service_type, - const std::string& service_name) OVERRIDE; - virtual void ServicesFlushed(const std::string& service_type) OVERRIDE; + const std::string& service_name) override; + virtual void ServicesFlushed(const std::string& service_type) override; DnsSdServiceTypeDataMap service_data_map_; diff --git a/chrome/browser/extensions/api/mdns/dns_sd_registry_unittest.cc b/chrome/browser/extensions/api/mdns/dns_sd_registry_unittest.cc index 42e5fa0..a40f85a 100644 --- a/chrome/browser/extensions/api/mdns/dns_sd_registry_unittest.cc +++ b/chrome/browser/extensions/api/mdns/dns_sd_registry_unittest.cc @@ -15,7 +15,7 @@ class MockDnsSdDeviceLister : public DnsSdDeviceLister { MockDnsSdDeviceLister() : DnsSdDeviceLister(NULL, NULL, "") {} virtual ~MockDnsSdDeviceLister() {} - virtual void Discover(bool force_update) OVERRIDE {} + virtual void Discover(bool force_update) override {} }; class TestDnsSdRegistry : public DnsSdRegistry { @@ -43,7 +43,7 @@ class TestDnsSdRegistry : public DnsSdRegistry { DnsSdDelegate* delegate, const std::string& service_type, local_discovery::ServiceDiscoverySharedClient* discovery_client) - OVERRIDE { + override { delegate_ = delegate; MockDnsSdDeviceLister* lister = new MockDnsSdDeviceLister(); listers_[service_type] = lister; @@ -67,7 +67,7 @@ class DnsSdRegistryTest : public testing::Test { DnsSdRegistryTest() {} virtual ~DnsSdRegistryTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { registry_.reset(new TestDnsSdRegistry()); registry_->AddObserver(&observer_); } diff --git a/chrome/browser/extensions/api/mdns/mdns_api.h b/chrome/browser/extensions/api/mdns/mdns_api.h index c58fcb5..e659b0a 100644 --- a/chrome/browser/extensions/api/mdns/mdns_api.h +++ b/chrome/browser/extensions/api/mdns/mdns_api.h @@ -49,13 +49,13 @@ class MDnsAPI : public BrowserContextKeyedAPI, friend class BrowserContextKeyedAPIFactory<MDnsAPI>; // EventRouter::Observer: - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; - virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; + virtual void OnListenerRemoved(const EventListenerInfo& details) override; // DnsSdRegistry::Observer virtual void OnDnsSdEvent( const std::string& service_type, - const DnsSdRegistry::DnsSdServiceList& services) OVERRIDE; + const DnsSdRegistry::DnsSdServiceList& services) override; // BrowserContextKeyedAPI implementation. static const char* service_name() { diff --git a/chrome/browser/extensions/api/mdns/mdns_apitest.cc b/chrome/browser/extensions/api/mdns/mdns_apitest.cc index 4be0607..5e4657a 100644 --- a/chrome/browser/extensions/api/mdns/mdns_apitest.cc +++ b/chrome/browser/extensions/api/mdns/mdns_apitest.cc @@ -42,7 +42,7 @@ class MDnsAPITest : public ExtensionApiTest { public: MDnsAPITest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( extensions::switches::kWhitelistedExtensionID, diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc index 7442819..71ce7d6 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc @@ -276,17 +276,17 @@ class SelectDirectoryDialog : public ui::SelectFileDialog::Listener, // ui::SelectFileDialog::Listener implementation. virtual void FileSelected(const base::FilePath& path, int index, - void* params) OVERRIDE { + void* params) override { callback_.Run(path); Release(); // Balanced in Show(). } virtual void MultiFilesSelected(const std::vector<base::FilePath>& files, - void* params) OVERRIDE { + void* params) override { NOTREACHED() << "Should not be able to select multiple files"; } - virtual void FileSelectionCanceled(void* params) OVERRIDE { + virtual void FileSelectionCanceled(void* params) override { callback_.Run(base::FilePath()); Release(); // Balanced in Show(). } diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.h b/chrome/browser/extensions/api/media_galleries/media_galleries_api.h index ede3dd7..f900ca7 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.h +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.h @@ -49,7 +49,7 @@ class MediaGalleriesEventRouter : public BrowserContextKeyedAPI, public extensions::EventRouter::Observer { public: // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<MediaGalleriesEventRouter>* @@ -62,13 +62,13 @@ class MediaGalleriesEventRouter : public BrowserContextKeyedAPI, bool ExtensionHasScanProgressListener(const std::string& extension_id) const; // MediaScanManagerObserver implementation. - virtual void OnScanStarted(const std::string& extension_id) OVERRIDE; - virtual void OnScanCancelled(const std::string& extension_id) OVERRIDE; + virtual void OnScanStarted(const std::string& extension_id) override; + virtual void OnScanCancelled(const std::string& extension_id) override; virtual void OnScanFinished( const std::string& extension_id, int gallery_count, - const MediaGalleryScanResult& file_counts) OVERRIDE; - virtual void OnScanError(const std::string& extension_id) OVERRIDE; + const MediaGalleryScanResult& file_counts) override; + virtual void OnScanError(const std::string& extension_id) override; private: friend class BrowserContextKeyedAPIFactory<MediaGalleriesEventRouter>; @@ -88,12 +88,12 @@ class MediaGalleriesEventRouter : public BrowserContextKeyedAPI, // GalleryWatchManagerObserver virtual void OnGalleryChanged(const std::string& extension_id, - MediaGalleryPrefId gallery_id) OVERRIDE; + MediaGalleryPrefId gallery_id) override; virtual void OnGalleryWatchDropped(const std::string& extension_id, - MediaGalleryPrefId gallery_id) OVERRIDE; + MediaGalleryPrefId gallery_id) override; // extensions::EventRouter::Observer implementation. - virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerRemoved(const EventListenerInfo& details) override; // Current profile. Profile* profile_; @@ -111,7 +111,7 @@ class MediaGalleriesGetMediaFileSystemsFunction protected: virtual ~MediaGalleriesGetMediaFileSystemsFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Bottom half for RunAsync, invoked after the preferences is initialized. @@ -148,7 +148,7 @@ class MediaGalleriesGetAllMediaFileSystemMetadataFunction protected: virtual ~MediaGalleriesGetAllMediaFileSystemMetadataFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Bottom half for RunAsync, invoked after the preferences is initialized. @@ -170,7 +170,7 @@ class MediaGalleriesAddUserSelectedFolderFunction protected: virtual ~MediaGalleriesAddUserSelectedFolderFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Bottom half for RunAsync, invoked after the preferences is initialized. @@ -203,7 +203,7 @@ class MediaGalleriesDropPermissionForMediaFileSystemFunction protected: virtual ~MediaGalleriesDropPermissionForMediaFileSystemFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Bottom half for RunAsync, invoked after the preferences is initialized. @@ -218,7 +218,7 @@ class MediaGalleriesStartMediaScanFunction protected: virtual ~MediaGalleriesStartMediaScanFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Bottom half for RunAsync, invoked after the preferences is initialized. @@ -233,7 +233,7 @@ class MediaGalleriesCancelMediaScanFunction protected: virtual ~MediaGalleriesCancelMediaScanFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Bottom half for RunAsync, invoked after the preferences is initialized. @@ -248,7 +248,7 @@ class MediaGalleriesAddScanResultsFunction protected: virtual ~MediaGalleriesAddScanResultsFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Pulled out for testing. virtual MediaGalleriesScanResultController* MakeDialog( @@ -275,7 +275,7 @@ class MediaGalleriesGetMetadataFunction : public ChromeAsyncExtensionFunction { protected: virtual ~MediaGalleriesGetMetadataFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Bottom half for RunAsync, invoked after the preferences is initialized. @@ -306,7 +306,7 @@ class MediaGalleriesAddGalleryWatchFunction protected: virtual ~MediaGalleriesAddGalleryWatchFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnPreferencesInit(const std::string& pref_id); @@ -323,7 +323,7 @@ class MediaGalleriesRemoveGalleryWatchFunction protected: virtual ~MediaGalleriesRemoveGalleryWatchFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnPreferencesInit(const std::string& pref_id); @@ -337,7 +337,7 @@ class MediaGalleriesGetAllGalleryWatchFunction protected: virtual ~MediaGalleriesGetAllGalleryWatchFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnPreferencesInit(); @@ -351,7 +351,7 @@ class MediaGalleriesRemoveAllGalleryWatchFunction protected: virtual ~MediaGalleriesRemoveAllGalleryWatchFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnPreferencesInit(); diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc index 7fae535..0ad28cf 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc @@ -78,7 +78,7 @@ class DoNothingMediaFolderFinder : public MediaFolderFinder { return new DoNothingMediaFolderFinder(callback); } - virtual void StartScan() OVERRIDE {} + virtual void StartScan() override {} private: }; @@ -99,7 +99,7 @@ class TestMediaGalleriesAddScanResultsFunction virtual MediaGalleriesScanResultController* MakeDialog( content::WebContents* web_contents, const extensions::Extension& extension, - const base::Closure& on_finish) OVERRIDE { + const base::Closure& on_finish) override { MediaGalleriesScanResultController* controller = extensions::MediaGalleriesAddScanResultsFunction::MakeDialog( web_contents, extension, on_finish); @@ -114,7 +114,7 @@ class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest { MediaGalleriesPlatformAppBrowserTest() : test_jpg_size_(0) {} virtual ~MediaGalleriesPlatformAppBrowserTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { PlatformAppBrowserTest::SetUpOnMainThread(); ensure_media_directories_exists_.reset(new EnsureMediaDirectoriesExists); @@ -124,7 +124,7 @@ class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest { test_jpg_size_ = base::checked_cast<int>(file_size); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { ensure_media_directories_exists_.reset(); PlatformAppBrowserTest::TearDownOnMainThread(); } @@ -438,12 +438,12 @@ class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest { class MediaGalleriesPlatformAppPpapiTest : public MediaGalleriesPlatformAppBrowserTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { MediaGalleriesPlatformAppBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnablePepperTesting); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { MediaGalleriesPlatformAppBrowserTest::SetUpOnMainThread(); ASSERT_TRUE(PathService::Get(chrome::DIR_GEN_TEST_DATA, &app_dir_)); diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc index 20f164b..7b7c987 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc @@ -83,12 +83,12 @@ class MediaGalleriesGalleryWatchApiTest : public ExtensionApiTest { protected: // ExtensionApiTest overrides. - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( extensions::switches::kWhitelistedExtensionID, kTestExtensionId); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); ensure_media_directories_exists_.reset(new EnsureMediaDirectoriesExists); extension_ = LoadExtension(test_data_dir_.AppendASCII(kTestExtensionPath)); @@ -96,7 +96,7 @@ class MediaGalleriesGalleryWatchApiTest : public ExtensionApiTest { CreateTestGallery(); FetchMediaGalleriesList(); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { extension_ = NULL; background_host_ = NULL; ensure_media_directories_exists_.reset(); diff --git a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h index 7443166..4cfb70f 100644 --- a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h +++ b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h @@ -58,14 +58,14 @@ class GalleryWatchStateTracker // |extension_id|. virtual void OnPermissionAdded(MediaGalleriesPreferences* pref, const std::string& extension_id, - MediaGalleryPrefId gallery_id) OVERRIDE; + MediaGalleryPrefId gallery_id) override; virtual void OnPermissionRemoved(MediaGalleriesPreferences* pref, const std::string& extension_id, - MediaGalleryPrefId gallery_id) OVERRIDE; + MediaGalleryPrefId gallery_id) override; virtual void OnGalleryRemoved(MediaGalleriesPreferences* pref, - MediaGalleryPrefId gallery_id) OVERRIDE; + MediaGalleryPrefId gallery_id) override; // Returns a set of watched gallery identifiers for the extension specified // by the |extension_id|. @@ -91,11 +91,11 @@ class GalleryWatchStateTracker // extensions::ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded(content::BrowserContext* browser_context, const Extension* extension, UnloadedExtensionInfo::Reason reason) - OVERRIDE; + override; // Syncs media gallery watch data for the given extension to/from the state // storage. diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h index e8e21ea..71363dc 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h @@ -36,7 +36,7 @@ class MediaGalleriesPrivateAPI : public BrowserContextKeyedAPI, virtual ~MediaGalleriesPrivateAPI(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<MediaGalleriesPrivateAPI>* @@ -46,7 +46,7 @@ class MediaGalleriesPrivateAPI : public BrowserContextKeyedAPI, static MediaGalleriesPrivateAPI* Get(content::BrowserContext* context); // EventRouter::Observer implementation. - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; MediaGalleriesPrivateEventRouter* GetEventRouter(); GalleryWatchStateTracker* GetGalleryWatchStateTracker(); @@ -88,7 +88,7 @@ class MediaGalleriesPrivateAddGalleryWatchFunction virtual ~MediaGalleriesPrivateAddGalleryWatchFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnPreferencesInit(const std::string& pref_id); @@ -108,7 +108,7 @@ class MediaGalleriesPrivateRemoveGalleryWatchFunction virtual ~MediaGalleriesPrivateRemoveGalleryWatchFunction(); // SyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnPreferencesInit(const std::string& pref_id); @@ -124,7 +124,7 @@ class MediaGalleriesPrivateGetAllGalleryWatchFunction virtual ~MediaGalleriesPrivateGetAllGalleryWatchFunction(); // SyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnPreferencesInit(); @@ -140,7 +140,7 @@ class MediaGalleriesPrivateRemoveAllGalleryWatchFunction virtual ~MediaGalleriesPrivateRemoveAllGalleryWatchFunction(); // SyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnPreferencesInit(); diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc index 3257802..554a5b4 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc @@ -79,13 +79,13 @@ class MediaGalleriesPrivateGalleryWatchApiTest : public ExtensionApiTest { protected: // ExtensionApiTest overrides. - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( extensions::switches::kWhitelistedExtensionID, kTestExtensionId); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); ensure_media_directories_exists_.reset(new EnsureMediaDirectoriesExists); extension_ = LoadExtension(test_data_dir_.AppendASCII(kTestExtensionPath)); @@ -93,7 +93,7 @@ class MediaGalleriesPrivateGalleryWatchApiTest : public ExtensionApiTest { CreateTestGallery(); FetchMediaGalleriesList(); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { extension_ = NULL; background_host_ = NULL; ensure_media_directories_exists_.reset(); diff --git a/chrome/browser/extensions/api/messaging/extension_message_port.h b/chrome/browser/extensions/api/messaging/extension_message_port.h index d0a6273..a10c031 100644 --- a/chrome/browser/extensions/api/messaging/extension_message_port.h +++ b/chrome/browser/extensions/api/messaging/extension_message_port.h @@ -28,14 +28,14 @@ class ExtensionMessagePort : public MessageService::MessagePort { const std::string& source_extension_id, const std::string& target_extension_id, const GURL& source_url, - const std::string& tls_channel_id) OVERRIDE; + const std::string& tls_channel_id) override; virtual void DispatchOnDisconnect(int source_port_id, - const std::string& error_message) OVERRIDE; + const std::string& error_message) override; virtual void DispatchOnMessage(const Message& message, - int target_port_id) OVERRIDE; - virtual void IncrementLazyKeepaliveCount() OVERRIDE; - virtual void DecrementLazyKeepaliveCount() OVERRIDE; - virtual content::RenderProcessHost* GetRenderProcessHost() OVERRIDE; + int target_port_id) override; + virtual void IncrementLazyKeepaliveCount() override; + virtual void DecrementLazyKeepaliveCount() override; + virtual content::RenderProcessHost* GetRenderProcessHost() override; private: content::RenderProcessHost* process_; diff --git a/chrome/browser/extensions/api/messaging/message_service.h b/chrome/browser/extensions/api/messaging/message_service.h index a8ca323..2fc5e80 100644 --- a/chrome/browser/extensions/api/messaging/message_service.h +++ b/chrome/browser/extensions/api/messaging/message_service.h @@ -147,7 +147,7 @@ class MessageService : public BrowserContextKeyedAPI, // Closes the message channel associated with the given port, and notifies // the other side. virtual void CloseChannel(int port_id, - const std::string& error_message) OVERRIDE; + const std::string& error_message) override; // Enqueues a message on a pending channel, or sends a message to the given // port if the channel isn't pending. @@ -156,7 +156,7 @@ class MessageService : public BrowserContextKeyedAPI, // NativeMessageProcessHost::Client virtual void PostMessageFromNativeProcess( int port_id, - const std::string& message) OVERRIDE; + const std::string& message) override; private: friend class MockMessageService; @@ -195,7 +195,7 @@ class MessageService : public BrowserContextKeyedAPI, // content::NotificationObserver interface. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // A process that might be in our list of channels has closed. void OnProcessClosed(content::RenderProcessHost* process); diff --git a/chrome/browser/extensions/api/messaging/native_message_port.h b/chrome/browser/extensions/api/messaging/native_message_port.h index f94db96..b3f7605 100644 --- a/chrome/browser/extensions/api/messaging/native_message_port.h +++ b/chrome/browser/extensions/api/messaging/native_message_port.h @@ -17,7 +17,7 @@ class NativeMessagePort : public MessageService::MessagePort { explicit NativeMessagePort(NativeMessageProcessHost* native_process); virtual ~NativeMessagePort(); virtual void DispatchOnMessage(const Message& message, - int target_port_id) OVERRIDE; + int target_port_id) override; private: NativeMessageProcessHost* native_process_; diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host.h b/chrome/browser/extensions/api/messaging/native_message_process_host.h index 47fe872..fb19240 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host.h +++ b/chrome/browser/extensions/api/messaging/native_message_process_host.h @@ -86,8 +86,8 @@ class NativeMessageProcessHost #if defined(OS_POSIX) // MessageLoopForIO::Watcher interface - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int fd) override; #endif // !defined(OS_POSIX) // Try and read a single message from |read_file_|. This should only be called diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc index 32cf9ce..bb9c7a0 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc @@ -81,7 +81,7 @@ class FakeLauncher : public NativeProcessLauncher { virtual void Launch(const GURL& origin, const std::string& native_host_name, - LaunchedCallback callback) const OVERRIDE { + LaunchedCallback callback) const override { callback.Run(NativeProcessLauncher::RESULT_SUCCESS, base::kNullProcessHandle, read_file_.Pass(), write_file_.Pass()); @@ -101,11 +101,11 @@ class NativeMessagingTest : public ::testing::Test, thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), channel_closed_(false) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (native_message_process_host_.get()) { BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, native_message_process_host_.release()); @@ -115,7 +115,7 @@ class NativeMessagingTest : public ::testing::Test, virtual void PostMessageFromNativeProcess( int port_id, - const std::string& message) OVERRIDE { + const std::string& message) override { last_message_ = message; // Parse the message. @@ -134,7 +134,7 @@ class NativeMessagingTest : public ::testing::Test, } virtual void CloseChannel(int port_id, - const std::string& error_message) OVERRIDE { + const std::string& error_message) override { channel_closed_ = true; if (run_loop_) run_loop_->Quit(); diff --git a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc index 4e4e909..0cdf3ef 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc @@ -25,7 +25,7 @@ const char kTestOrigin[] = class NativeMessagingHostManifestTest : public ::testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); manifest_path_ = temp_dir_.path().AppendASCII("test.json"); } diff --git a/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h b/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h index 6cd3a8e..fc099e4 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h +++ b/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h @@ -28,9 +28,9 @@ class NativeMessagingHostListPolicyHandler // ConfigurationPolicyHandler methods: virtual bool CheckPolicySettings(const policy::PolicyMap& policies, - policy::PolicyErrorMap* errors) OVERRIDE; + policy::PolicyErrorMap* errors) override; virtual void ApplyPolicySettings(const policy::PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; protected: const char* pref_path() const; diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher.cc b/chrome/browser/extensions/api/messaging/native_process_launcher.cc index 45cfd3c..8073b79 100644 --- a/chrome/browser/extensions/api/messaging/native_process_launcher.cc +++ b/chrome/browser/extensions/api/messaging/native_process_launcher.cc @@ -43,7 +43,7 @@ class NativeProcessLauncherImpl : public NativeProcessLauncher { virtual void Launch(const GURL& origin, const std::string& native_host_name, - LaunchedCallback callback) const OVERRIDE; + LaunchedCallback callback) const override; private: class Core : public base::RefCountedThreadSafe<Core> { diff --git a/chrome/browser/extensions/api/metrics_private/metrics_private_api.h b/chrome/browser/extensions/api/metrics_private/metrics_private_api.h index 42f9175..1eb5eb0 100644 --- a/chrome/browser/extensions/api/metrics_private/metrics_private_api.h +++ b/chrome/browser/extensions/api/metrics_private/metrics_private_api.h @@ -22,7 +22,7 @@ class MetricsPrivateGetIsCrashReportingEnabledFunction virtual ~MetricsPrivateGetIsCrashReportingEnabledFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class MetricsPrivateGetFieldTrialFunction : public SyncExtensionFunction { @@ -34,7 +34,7 @@ class MetricsPrivateGetFieldTrialFunction : public SyncExtensionFunction { virtual ~MetricsPrivateGetFieldTrialFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class MetricsPrivateGetVariationParamsFunction : public SyncExtensionFunction { @@ -46,7 +46,7 @@ class MetricsPrivateGetVariationParamsFunction : public SyncExtensionFunction { virtual ~MetricsPrivateGetVariationParamsFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class MetricsPrivateRecordUserActionFunction : public SyncExtensionFunction { @@ -58,7 +58,7 @@ class MetricsPrivateRecordUserActionFunction : public SyncExtensionFunction { virtual ~MetricsPrivateRecordUserActionFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class MetricsHistogramHelperFunction : public SyncExtensionFunction { @@ -80,7 +80,7 @@ class MetricsPrivateRecordValueFunction virtual ~MetricsPrivateRecordValueFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class MetricsPrivateRecordSparseValueFunction @@ -93,7 +93,7 @@ class MetricsPrivateRecordSparseValueFunction virtual ~MetricsPrivateRecordSparseValueFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class MetricsPrivateRecordPercentageFunction @@ -106,7 +106,7 @@ class MetricsPrivateRecordPercentageFunction virtual ~MetricsPrivateRecordPercentageFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class MetricsPrivateRecordCountFunction @@ -119,7 +119,7 @@ class MetricsPrivateRecordCountFunction virtual ~MetricsPrivateRecordCountFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class MetricsPrivateRecordSmallCountFunction @@ -132,7 +132,7 @@ class MetricsPrivateRecordSmallCountFunction virtual ~MetricsPrivateRecordSmallCountFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class MetricsPrivateRecordMediumCountFunction @@ -145,7 +145,7 @@ class MetricsPrivateRecordMediumCountFunction virtual ~MetricsPrivateRecordMediumCountFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class MetricsPrivateRecordTimeFunction : public MetricsHistogramHelperFunction { @@ -157,7 +157,7 @@ class MetricsPrivateRecordTimeFunction : public MetricsHistogramHelperFunction { virtual ~MetricsPrivateRecordTimeFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class MetricsPrivateRecordMediumTimeFunction @@ -170,7 +170,7 @@ class MetricsPrivateRecordMediumTimeFunction virtual ~MetricsPrivateRecordMediumTimeFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class MetricsPrivateRecordLongTimeFunction @@ -183,7 +183,7 @@ class MetricsPrivateRecordLongTimeFunction virtual ~MetricsPrivateRecordLongTimeFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/module/module.h b/chrome/browser/extensions/api/module/module.h index a6f00f4..76b096a 100644 --- a/chrome/browser/extensions/api/module/module.h +++ b/chrome/browser/extensions/api/module/module.h @@ -25,7 +25,7 @@ class ExtensionSetUpdateUrlDataFunction : public ChromeSyncExtensionFunction { virtual ~ExtensionSetUpdateUrlDataFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ExtensionIsAllowedIncognitoAccessFunction @@ -38,7 +38,7 @@ class ExtensionIsAllowedIncognitoAccessFunction virtual ~ExtensionIsAllowedIncognitoAccessFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ExtensionIsAllowedFileSchemeAccessFunction @@ -51,7 +51,7 @@ class ExtensionIsAllowedFileSchemeAccessFunction virtual ~ExtensionIsAllowedFileSchemeAccessFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/music_manager_private/music_manager_private_api.h b/chrome/browser/extensions/api/music_manager_private/music_manager_private_api.h index 9c43be2..d1e9d99 100644 --- a/chrome/browser/extensions/api/music_manager_private/music_manager_private_api.h +++ b/chrome/browser/extensions/api/music_manager_private/music_manager_private_api.h @@ -21,7 +21,7 @@ class MusicManagerPrivateGetDeviceIdFunction : public AsyncExtensionFunction { virtual ~MusicManagerPrivateGetDeviceIdFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void DeviceIdCallback(const std::string& device_id); }; diff --git a/chrome/browser/extensions/api/networking_private/crypto_verify_impl.h b/chrome/browser/extensions/api/networking_private/crypto_verify_impl.h index 17a01b1..1f3d8d6 100644 --- a/chrome/browser/extensions/api/networking_private/crypto_verify_impl.h +++ b/chrome/browser/extensions/api/networking_private/crypto_verify_impl.h @@ -20,15 +20,15 @@ class CryptoVerifyImpl // NetworkingPrivateServiceClient::CryptoVerify virtual void VerifyDestination(const Credentials& credentials, bool* verified, - std::string* error) OVERRIDE; + std::string* error) override; virtual void VerifyAndEncryptCredentials( const std::string& network_guid, const Credentials& credentials, - const VerifyAndEncryptCredentialsCallback& callback) OVERRIDE; + const VerifyAndEncryptCredentialsCallback& callback) override; virtual void VerifyAndEncryptData(const Credentials& credentials, const std::string& data, std::string* base64_encoded_ciphertext, - std::string* error) OVERRIDE; + std::string* error) override; private: DISALLOW_COPY_AND_ASSIGN(CryptoVerifyImpl); diff --git a/chrome/browser/extensions/api/networking_private/networking_private_api.h b/chrome/browser/extensions/api/networking_private/networking_private_api.h index 291e9c8..b82eb92 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_api.h +++ b/chrome/browser/extensions/api/networking_private/networking_private_api.h @@ -35,7 +35,7 @@ class NetworkingPrivateGetPropertiesFunction : public AsyncExtensionFunction { virtual ~NetworkingPrivateGetPropertiesFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Success(scoped_ptr<base::DictionaryValue> result); @@ -56,7 +56,7 @@ class NetworkingPrivateGetManagedPropertiesFunction virtual ~NetworkingPrivateGetManagedPropertiesFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Success(scoped_ptr<base::DictionaryValue> result); @@ -76,7 +76,7 @@ class NetworkingPrivateGetStateFunction : public AsyncExtensionFunction { virtual ~NetworkingPrivateGetStateFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Success(scoped_ptr<base::DictionaryValue> result); @@ -96,7 +96,7 @@ class NetworkingPrivateSetPropertiesFunction : public AsyncExtensionFunction { virtual ~NetworkingPrivateSetPropertiesFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Success(); @@ -116,7 +116,7 @@ class NetworkingPrivateCreateNetworkFunction : public AsyncExtensionFunction { virtual ~NetworkingPrivateCreateNetworkFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Success(const std::string& guid); @@ -136,7 +136,7 @@ class NetworkingPrivateGetNetworksFunction : public AsyncExtensionFunction { virtual ~NetworkingPrivateGetNetworksFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Success(scoped_ptr<base::ListValue> network_list); @@ -157,7 +157,7 @@ class NetworkingPrivateGetVisibleNetworksFunction virtual ~NetworkingPrivateGetVisibleNetworksFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Success(scoped_ptr<base::ListValue> network_list); @@ -178,7 +178,7 @@ class NetworkingPrivateGetEnabledNetworkTypesFunction virtual ~NetworkingPrivateGetEnabledNetworkTypesFunction(); // SyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateGetEnabledNetworkTypesFunction); @@ -196,7 +196,7 @@ class NetworkingPrivateEnableNetworkTypeFunction virtual ~NetworkingPrivateEnableNetworkTypeFunction(); // SyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateEnableNetworkTypeFunction); @@ -214,7 +214,7 @@ class NetworkingPrivateDisableNetworkTypeFunction virtual ~NetworkingPrivateDisableNetworkTypeFunction(); // SyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateDisableNetworkTypeFunction); @@ -232,7 +232,7 @@ class NetworkingPrivateRequestNetworkScanFunction virtual ~NetworkingPrivateRequestNetworkScanFunction(); // SyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateRequestNetworkScanFunction); @@ -250,7 +250,7 @@ class NetworkingPrivateStartConnectFunction : public AsyncExtensionFunction { virtual ~NetworkingPrivateStartConnectFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Success(); @@ -270,7 +270,7 @@ class NetworkingPrivateStartDisconnectFunction : public AsyncExtensionFunction { virtual ~NetworkingPrivateStartDisconnectFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void Success(); @@ -291,7 +291,7 @@ class NetworkingPrivateVerifyDestinationFunction virtual ~NetworkingPrivateVerifyDestinationFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void Success(bool result); void Failure(const std::string& error); @@ -312,7 +312,7 @@ class NetworkingPrivateVerifyAndEncryptCredentialsFunction virtual ~NetworkingPrivateVerifyAndEncryptCredentialsFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void Success(const std::string& result); void Failure(const std::string& error); @@ -334,7 +334,7 @@ class NetworkingPrivateVerifyAndEncryptDataFunction virtual ~NetworkingPrivateVerifyAndEncryptDataFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void Success(const std::string& result); void Failure(const std::string& error); @@ -355,7 +355,7 @@ class NetworkingPrivateSetWifiTDLSEnabledStateFunction virtual ~NetworkingPrivateSetWifiTDLSEnabledStateFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void Success(const std::string& result); void Failure(const std::string& error); @@ -376,7 +376,7 @@ class NetworkingPrivateGetWifiTDLSStatusFunction virtual ~NetworkingPrivateGetWifiTDLSStatusFunction(); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void Success(const std::string& result); void Failure(const std::string& error); @@ -393,7 +393,7 @@ class NetworkingPrivateGetCaptivePortalStatusFunction NETWORKINGPRIVATE_GETCAPTIVEPORTALSTATUS); // AsyncExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; protected: virtual ~NetworkingPrivateGetCaptivePortalStatusFunction(); diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc index 20bf3a4..741933f 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc @@ -88,7 +88,7 @@ class TestListener : public content::NotificationObserver { virtual void Observe(int type, const content::NotificationSource& /* source */, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { const std::string& message = *content::Details<std::string>(details).ptr(); if (message == message_) callback_.Run(); @@ -113,21 +113,21 @@ class CryptoVerifyStub : public extensions::NetworkingPrivateServiceClient::CryptoVerify { virtual void VerifyDestination(const Credentials& verification_properties, bool* verified, - std::string* error) OVERRIDE { + std::string* error) override { *verified = true; } virtual void VerifyAndEncryptCredentials( const std::string& network_guid, const Credentials& credentials, - const VerifyAndEncryptCredentialsCallback& callback) OVERRIDE { + const VerifyAndEncryptCredentialsCallback& callback) override { callback.Run("encrypted_credentials", ""); } virtual void VerifyAndEncryptData(const Credentials& verification_properties, const std::string& data, std::string* base64_encoded_ciphertext, - std::string* error) OVERRIDE { + std::string* error) override { *base64_encoded_ciphertext = "encrypted_data"; } }; @@ -152,7 +152,7 @@ class ExtensionNetworkingPrivateApiTest kFlagEnableFileAccess | kFlagLoadAsComponent); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { #if defined(OS_CHROMEOS) EXPECT_CALL(provider_, IsInitializationComplete(_)) .WillRepeatedly(Return(true)); @@ -170,7 +170,7 @@ class ExtensionNetworkingPrivateApiTest *out = result; } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); // Whitelist the extension ID of the test extension. command_line->AppendSwitchASCII( @@ -243,7 +243,7 @@ class ExtensionNetworkingPrivateApiTest type, state, true /* add_to_visible */); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { detector_ = new NetworkPortalDetectorTestImpl(); NetworkPortalDetector::InitializeForTesting(detector_); @@ -369,7 +369,7 @@ class ExtensionNetworkingPrivateApiTest content::RunAllPendingInMessageLoop(); } #else // !defined(OS_CHROMEOS) - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); // Whitelist the extension ID of the test extension. command_line->AppendSwitchASCII( @@ -383,7 +383,7 @@ class ExtensionNetworkingPrivateApiTest new wifi::FakeWiFiService(), new CryptoVerifyStub()); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); content::RunAllPendingInMessageLoop(); NetworkingPrivateServiceClientFactory::GetInstance()->SetTestingFactory( diff --git a/chrome/browser/extensions/api/networking_private/networking_private_chromeos.h b/chrome/browser/extensions/api/networking_private/networking_private_chromeos.h index 743b865..7140404 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_chromeos.h +++ b/chrome/browser/extensions/api/networking_private/networking_private_chromeos.h @@ -24,66 +24,66 @@ class NetworkingPrivateChromeOS : public KeyedService, // NetworkingPrivateApi virtual void GetProperties(const std::string& guid, const DictionaryCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void GetManagedProperties( const std::string& guid, const DictionaryCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void GetState(const std::string& guid, const DictionaryCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void SetProperties(const std::string& guid, scoped_ptr<base::DictionaryValue> properties, const VoidCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void CreateNetwork(bool shared, scoped_ptr<base::DictionaryValue> properties, const StringCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void GetNetworks(const std::string& network_type, bool configured_only, bool visible_only, int limit, const NetworkListCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void StartConnect(const std::string& guid, const VoidCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void StartDisconnect( const std::string& guid, const VoidCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void VerifyDestination( const VerificationProperties& verification_properties, const BoolCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void VerifyAndEncryptCredentials( const std::string& guid, const VerificationProperties& verification_properties, const StringCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void VerifyAndEncryptData( const VerificationProperties& verification_properties, const std::string& data, const StringCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void SetWifiTDLSEnabledState( const std::string& ip_or_mac_address, bool enabled, const StringCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void GetWifiTDLSStatus( const std::string& ip_or_mac_address, const StringCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void GetCaptivePortalStatus( const std::string& guid, const StringCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; - virtual scoped_ptr<base::ListValue> GetEnabledNetworkTypes() OVERRIDE; - virtual bool EnableNetworkType(const std::string& type) OVERRIDE; - virtual bool DisableNetworkType(const std::string& type) OVERRIDE; - virtual bool RequestScan() OVERRIDE; + const FailureCallback& failure_callback) override; + virtual scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override; + virtual bool EnableNetworkType(const std::string& type) override; + virtual bool DisableNetworkType(const std::string& type) override; + virtual bool RequestScan() override; private: virtual ~NetworkingPrivateChromeOS(); diff --git a/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_mac.cc b/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_mac.cc index a272646..9d5643f 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_mac.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_mac.cc @@ -26,7 +26,7 @@ class NetworkingPrivateCredentialsGetterMac const std::string& network_guid, const std::string& public_key, const extensions::NetworkingPrivateServiceClient::CryptoVerify:: - VerifyAndEncryptCredentialsCallback& callback) OVERRIDE; + VerifyAndEncryptCredentialsCallback& callback) override; private: virtual ~NetworkingPrivateCredentialsGetterMac(); diff --git a/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_win.cc b/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_win.cc index 4832eb6..d4cfe78 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_win.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_win.cc @@ -26,9 +26,9 @@ class CredentialsGetterHostClient : public content::UtilityProcessHostClient { virtual ~CredentialsGetterHostClient(); // UtilityProcessHostClient - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnProcessCrashed(int exit_code) OVERRIDE; - virtual void OnProcessLaunchFailed() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnProcessCrashed(int exit_code) override; + virtual void OnProcessLaunchFailed() override; // IPC message handlers. void OnGotCredentials(const std::string& key_data, bool success); @@ -119,7 +119,7 @@ class NetworkingPrivateCredentialsGetterWin const std::string& network_guid, const std::string& public_key, const extensions::NetworkingPrivateServiceClient::CryptoVerify:: - VerifyAndEncryptCredentialsCallback& callback) OVERRIDE; + VerifyAndEncryptCredentialsCallback& callback) override; private: virtual ~NetworkingPrivateCredentialsGetterWin(); diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc index fda00fb..f2f5045 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc @@ -39,20 +39,20 @@ class NetworkingPrivateEventRouterImpl protected: // KeyedService overrides: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // EventRouter::Observer overrides: - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; - virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; + virtual void OnListenerRemoved(const EventListenerInfo& details) override; // NetworkStateHandlerObserver overrides: - virtual void NetworkListChanged() OVERRIDE; - virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE; + virtual void NetworkListChanged() override; + virtual void NetworkPropertiesUpdated(const NetworkState* network) override; // NetworkPortalDetector::Observer overrides: virtual void OnPortalDetectionCompleted( const NetworkState* network, - const NetworkPortalDetector::CaptivePortalState& state) OVERRIDE; + const NetworkPortalDetector::CaptivePortalState& state) override; private: // Decide if we should listen for network changes or not. If there are any diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.h b/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.h index c3bae6d..463b9df 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.h +++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.h @@ -29,9 +29,9 @@ class NetworkingPrivateEventRouterFactory protected: // BrowserContextKeyedBaseFactory overrides: virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; private: friend struct DefaultSingletonTraits<NetworkingPrivateEventRouterFactory>; @@ -41,7 +41,7 @@ class NetworkingPrivateEventRouterFactory // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateEventRouterFactory); }; diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc index 5e5416a..8185b74 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc @@ -23,17 +23,17 @@ class NetworkingPrivateEventRouterImpl protected: // KeyedService overrides: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // EventRouter::Observer overrides: - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; - virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; + virtual void OnListenerRemoved(const EventListenerInfo& details) override; // NetworkingPrivateServiceClient::Observer overrides: virtual void OnNetworksChangedEvent( - const std::vector<std::string>& network_guids) OVERRIDE; + const std::vector<std::string>& network_guids) override; virtual void OnNetworkListChangedEvent( - const std::vector<std::string>& network_guids) OVERRIDE; + const std::vector<std::string>& network_guids) override; private: // Decide if we should listen for network changes or not. If there are any diff --git a/chrome/browser/extensions/api/networking_private/networking_private_factory_chromeos.h b/chrome/browser/extensions/api/networking_private/networking_private_factory_chromeos.h index 1193635..9898dab 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_factory_chromeos.h +++ b/chrome/browser/extensions/api/networking_private/networking_private_factory_chromeos.h @@ -30,11 +30,11 @@ class NetworkingPrivateChromeOSFactory // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* browser_context) const OVERRIDE; + content::BrowserContext* browser_context) const override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateChromeOSFactory); }; diff --git a/chrome/browser/extensions/api/networking_private/networking_private_service_client.h b/chrome/browser/extensions/api/networking_private/networking_private_service_client.h index 63708c5..f266c65 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_service_client.h +++ b/chrome/browser/extensions/api/networking_private/networking_private_service_client.h @@ -112,71 +112,71 @@ class NetworkingPrivateServiceClient CryptoVerify* crypto_verify); // KeyedService - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // NetworkingPrivateDelegate virtual void GetProperties(const std::string& guid, const DictionaryCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void GetManagedProperties( const std::string& guid, const DictionaryCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void GetState(const std::string& guid, const DictionaryCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void SetProperties(const std::string& guid, scoped_ptr<base::DictionaryValue> properties_dict, const VoidCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void CreateNetwork(bool shared, scoped_ptr<base::DictionaryValue> properties_dict, const StringCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void GetNetworks(const std::string& network_type, bool configured_only, bool visible_only, int limit, const NetworkListCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void StartConnect(const std::string& guid, const VoidCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void StartDisconnect( const std::string& guid, const VoidCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void VerifyDestination( const VerificationProperties& verification_properties, const BoolCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void VerifyAndEncryptCredentials( const std::string& guid, const VerificationProperties& verification_properties, const StringCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void VerifyAndEncryptData( const VerificationProperties& verification_properties, const std::string& data, const StringCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void SetWifiTDLSEnabledState( const std::string& ip_or_mac_address, bool enabled, const StringCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void GetWifiTDLSStatus( const std::string& ip_or_mac_address, const StringCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; + const FailureCallback& failure_callback) override; virtual void GetCaptivePortalStatus( const std::string& guid, const StringCallback& success_callback, - const FailureCallback& failure_callback) OVERRIDE; - virtual scoped_ptr<base::ListValue> GetEnabledNetworkTypes() OVERRIDE; - virtual bool EnableNetworkType(const std::string& type) OVERRIDE; - virtual bool DisableNetworkType(const std::string& type) OVERRIDE; - virtual bool RequestScan() OVERRIDE; + const FailureCallback& failure_callback) override; + virtual scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override; + virtual bool EnableNetworkType(const std::string& type) override; + virtual bool DisableNetworkType(const std::string& type) override; + virtual bool RequestScan() override; // Adds observer to network events. void AddObserver(Observer* network_events_observer); @@ -187,7 +187,7 @@ class NetworkingPrivateServiceClient // NetworkChangeNotifier::NetworkChangeObserver implementation. virtual void OnNetworkChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; + net::NetworkChangeNotifier::ConnectionType type) override; private: // Callbacks to extension api function objects. Keep reference to API object diff --git a/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.h b/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.h index bf8026d..2a7cb93 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.h +++ b/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.h @@ -32,9 +32,9 @@ class NetworkingPrivateServiceClientFactory // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* browser_context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* browser_context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateServiceClientFactory); }; diff --git a/chrome/browser/extensions/api/notification_provider/notification_provider_api.h b/chrome/browser/extensions/api/notification_provider/notification_provider_api.h index 88f2d2e..46c6537 100644 --- a/chrome/browser/extensions/api/notification_provider/notification_provider_api.h +++ b/chrome/browser/extensions/api/notification_provider/notification_provider_api.h @@ -70,7 +70,7 @@ class NotificationProviderNotifyOnClearedFunction NOTIFICATIONPROVIDER_NOTIFYONCLEARED); // UIThreadExtensionFunction implementation. - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; // Implememtation of NotifyOnClicked function of the API. It will inform the @@ -89,7 +89,7 @@ class NotificationProviderNotifyOnClickedFunction NOTIFICATIONPROVIDER_NOTIFYONCLICKED); // UIThreadExtensionFunction implementation. - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; // Implememtation of NotifyOnButtonClicked function of the API. It will inform @@ -109,7 +109,7 @@ class NotificationProviderNotifyOnButtonClickedFunction NOTIFICATIONPROVIDER_NOTIFYONBUTTONCLICKED); // UIThreadExtensionFunction implementation. - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; // Implememtation of NotifyOnPermissionLevelChanged function of the API. It will @@ -129,7 +129,7 @@ class NotificationProviderNotifyOnPermissionLevelChangedFunction NOTIFICATIONPROVIDER_NOTIFYONPERMISSIONLEVELCHANGED); // UIThreadExtensionFunction implementation. - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; // Implememtation of NotifyOnShowSettings function of the API. It will inform @@ -147,7 +147,7 @@ class NotificationProviderNotifyOnShowSettingsFunction NOTIFICATIONPROVIDER_NOTIFYONSHOWSETTINGS); // UIThreadExtensionFunction implementation. - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; // Implememtation of GetNotifier function of the API. It will get the notifier @@ -165,7 +165,7 @@ class NotificationProviderGetNotifierFunction NOTIFICATIONPROVIDER_GETNOTIFIER); // UIThreadExtensionFunction implementation. - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; // Implememtation of GetAllNotifiers function of the API. It will get all the @@ -183,7 +183,7 @@ class NotificationProviderGetAllNotifiersFunction NOTIFICATIONPROVIDER_GETALLNOTIFIERS); // UIThreadExtensionFunction implementation. - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc index 631dbf4..d5e6e56 100644 --- a/chrome/browser/extensions/api/notifications/notifications_api.cc +++ b/chrome/browser/extensions/api/notifications/notifications_api.cc @@ -85,11 +85,11 @@ class NotificationsApiDelegate : public NotificationDelegate { DCHECK(api_function_.get()); } - virtual void Display() OVERRIDE { } + virtual void Display() override { } - virtual void Error() OVERRIDE {} + virtual void Error() override {} - virtual void Close(bool by_user) OVERRIDE { + virtual void Close(bool by_user) override { EventRouter::UserGestureState gesture = by_user ? EventRouter::USER_GESTURE_ENABLED : EventRouter::USER_GESTURE_NOT_ENABLED; @@ -98,19 +98,19 @@ class NotificationsApiDelegate : public NotificationDelegate { SendEvent(notifications::OnClosed::kEventName, gesture, args.Pass()); } - virtual void Click() OVERRIDE { + virtual void Click() override { scoped_ptr<base::ListValue> args(CreateBaseEventArgs()); SendEvent(notifications::OnClicked::kEventName, EventRouter::USER_GESTURE_ENABLED, args.Pass()); } - virtual bool HasClickedListener() OVERRIDE { + virtual bool HasClickedListener() override { return EventRouter::Get(profile_)->HasEventListener( notifications::OnClicked::kEventName); } - virtual void ButtonClick(int index) OVERRIDE { + virtual void ButtonClick(int index) override { scoped_ptr<base::ListValue> args(CreateBaseEventArgs()); args->Append(new base::FundamentalValue(index)); SendEvent(notifications::OnButtonClicked::kEventName, @@ -118,11 +118,11 @@ class NotificationsApiDelegate : public NotificationDelegate { args.Pass()); } - virtual std::string id() const OVERRIDE { + virtual std::string id() const override { return scoped_id_; } - virtual content::WebContents* GetWebContents() const OVERRIDE { + virtual content::WebContents* GetWebContents() const override { // We're holding a reference to api_function_, so we know it'll be valid // until ReleaseRVH is called, and api_function_ (as a // AsyncExtensionFunction) will zero out its copy of render_view_host @@ -135,7 +135,7 @@ class NotificationsApiDelegate : public NotificationDelegate { return content::WebContents::FromRenderViewHost(rvh); } - virtual void ReleaseRenderViewHost() OVERRIDE { + virtual void ReleaseRenderViewHost() override { api_function_ = NULL; } diff --git a/chrome/browser/extensions/api/notifications/notifications_api.h b/chrome/browser/extensions/api/notifications/notifications_api.h index bd1b511..2f130b5d 100644 --- a/chrome/browser/extensions/api/notifications/notifications_api.h +++ b/chrome/browser/extensions/api/notifications/notifications_api.h @@ -45,7 +45,7 @@ class NotificationsApiFunction : public ChromeAsyncExtensionFunction { virtual bool RunNotificationsApi() = 0; // UITHreadExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; message_center::NotificationType MapApiTemplateTypeToType( api::notifications::TemplateType type); @@ -56,7 +56,7 @@ class NotificationsCreateFunction : public NotificationsApiFunction { NotificationsCreateFunction(); // NotificationsApiFunction: - virtual bool RunNotificationsApi() OVERRIDE; + virtual bool RunNotificationsApi() override; protected: virtual ~NotificationsCreateFunction(); @@ -72,7 +72,7 @@ class NotificationsUpdateFunction : public NotificationsApiFunction { NotificationsUpdateFunction(); // NotificationsApiFunction: - virtual bool RunNotificationsApi() OVERRIDE; + virtual bool RunNotificationsApi() override; protected: virtual ~NotificationsUpdateFunction(); @@ -88,7 +88,7 @@ class NotificationsClearFunction : public NotificationsApiFunction { NotificationsClearFunction(); // NotificationsApiFunction: - virtual bool RunNotificationsApi() OVERRIDE; + virtual bool RunNotificationsApi() override; protected: virtual ~NotificationsClearFunction(); @@ -104,7 +104,7 @@ class NotificationsGetAllFunction : public NotificationsApiFunction { NotificationsGetAllFunction(); // NotificationsApiFunction: - virtual bool RunNotificationsApi() OVERRIDE; + virtual bool RunNotificationsApi() override; protected: virtual ~NotificationsGetAllFunction(); @@ -119,8 +119,8 @@ class NotificationsGetPermissionLevelFunction NotificationsGetPermissionLevelFunction(); // NotificationsApiFunction: - virtual bool CanRunWhileDisabled() const OVERRIDE; - virtual bool RunNotificationsApi() OVERRIDE; + virtual bool CanRunWhileDisabled() const override; + virtual bool RunNotificationsApi() override; protected: virtual ~NotificationsGetPermissionLevelFunction(); diff --git a/chrome/browser/extensions/api/notifications/notifications_apitest.cc b/chrome/browser/extensions/api/notifications/notifications_apitest.cc index f9b10f0..d786df6 100644 --- a/chrome/browser/extensions/api/notifications/notifications_apitest.cc +++ b/chrome/browser/extensions/api/notifications/notifications_apitest.cc @@ -60,7 +60,7 @@ class UserGestureCatcher : public content::NotificationObserver { private: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { results_.push_back( static_cast<content::Source<extensions::TestSendMessageFunction> >( source) diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.h b/chrome/browser/extensions/api/omnibox/omnibox_api.h index f35d13c..036cd63 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.h +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.h @@ -80,7 +80,7 @@ class OmniboxSendSuggestionsFunction : public ChromeSyncExtensionFunction { virtual ~OmniboxSendSuggestionsFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class OmniboxAPI : public BrowserContextKeyedAPI, @@ -96,7 +96,7 @@ class OmniboxAPI : public BrowserContextKeyedAPI, static OmniboxAPI* Get(content::BrowserContext* context); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // Returns the icon to display in the omnibox for the given extension. gfx::Image GetOmniboxIcon(const std::string& extension_id); @@ -114,11 +114,11 @@ class OmniboxAPI : public BrowserContextKeyedAPI, // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // BrowserContextKeyedAPI implementation. static const char* service_name() { @@ -159,7 +159,7 @@ class OmniboxSetDefaultSuggestionFunction : public ChromeSyncExtensionFunction { virtual ~OmniboxSetDefaultSuggestionFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // If the extension has set a custom default suggestion via diff --git a/chrome/browser/extensions/api/page_capture/page_capture_api.h b/chrome/browser/extensions/api/page_capture/page_capture_api.h index 6de90af..2a773a3 100644 --- a/chrome/browser/extensions/api/page_capture/page_capture_api.h +++ b/chrome/browser/extensions/api/page_capture/page_capture_api.h @@ -37,8 +37,8 @@ class PageCaptureSaveAsMHTMLFunction : public ChromeAsyncExtensionFunction { private: virtual ~PageCaptureSaveAsMHTMLFunction(); - virtual bool RunAsync() OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool RunAsync() override; + virtual bool OnMessageReceived(const IPC::Message& message) override; // Called on the file thread. void CreateTemporaryFile(); diff --git a/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc b/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc index 5eb86da..6805466 100644 --- a/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc +++ b/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc @@ -14,7 +14,7 @@ using extensions::PageCaptureSaveAsMHTMLFunction; class ExtensionPageCaptureApiTest : public ExtensionApiTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc"); } @@ -32,7 +32,7 @@ class PageCaptureSaveAsMHTMLDelegate } virtual void OnTemporaryFileCreated( - const base::FilePath& temp_file) OVERRIDE { + const base::FilePath& temp_file) override { temp_file_ = temp_file; } diff --git a/chrome/browser/extensions/api/permissions/permissions_api.h b/chrome/browser/extensions/api/permissions/permissions_api.h index 074d6f9..d0eaa52 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api.h +++ b/chrome/browser/extensions/api/permissions/permissions_api.h @@ -23,7 +23,7 @@ class PermissionsContainsFunction : public ChromeSyncExtensionFunction { virtual ~PermissionsContainsFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // chrome.permissions.getAll @@ -35,7 +35,7 @@ class PermissionsGetAllFunction : public ChromeSyncExtensionFunction { virtual ~PermissionsGetAllFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // chrome.permissions.remove @@ -47,7 +47,7 @@ class PermissionsRemoveFunction : public ChromeSyncExtensionFunction { virtual ~PermissionsRemoveFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // chrome.permissions.request @@ -63,14 +63,14 @@ class PermissionsRequestFunction : public ChromeAsyncExtensionFunction, static void SetIgnoreUserGestureForTests(bool ignore); // ExtensionInstallPrompt::Delegate: - virtual void InstallUIProceed() OVERRIDE; - virtual void InstallUIAbort(bool user_initiated) OVERRIDE; + virtual void InstallUIProceed() override; + virtual void InstallUIAbort(bool user_initiated) override; protected: virtual ~PermissionsRequestFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: scoped_ptr<ExtensionInstallPrompt> install_ui_; diff --git a/chrome/browser/extensions/api/permissions/permissions_apitest.cc b/chrome/browser/extensions/api/permissions/permissions_apitest.cc index b8b2a99..cbb885e 100644 --- a/chrome/browser/extensions/api/permissions/permissions_apitest.cc +++ b/chrome/browser/extensions/api/permissions/permissions_apitest.cc @@ -24,7 +24,7 @@ static void AddPattern(URLPatternSet* extent, const std::string& pattern) { class ExperimentalApiTest : public ExtensionApiTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); } diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting.h b/chrome/browser/extensions/api/preference/chrome_direct_setting.h index c71432f..aacbe1d 100644 --- a/chrome/browser/extensions/api/preference/chrome_direct_setting.h +++ b/chrome/browser/extensions/api/preference/chrome_direct_setting.h @@ -38,7 +38,7 @@ class GetDirectSettingFunction : public DirectSettingFunctionBase { protected: // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: virtual ~GetDirectSettingFunction(); @@ -54,7 +54,7 @@ class SetDirectSettingFunction : public DirectSettingFunctionBase { protected: // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: virtual ~SetDirectSettingFunction(); @@ -70,7 +70,7 @@ class ClearDirectSettingFunction : public DirectSettingFunctionBase { protected: // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: virtual ~ClearDirectSettingFunction(); diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h index f663c30..d10c03b 100644 --- a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h +++ b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h @@ -26,14 +26,14 @@ class ChromeDirectSettingAPI : public BrowserContextKeyedAPI, virtual ~ChromeDirectSettingAPI(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<ChromeDirectSettingAPI>* GetFactoryInstance(); // EventRouter::Observer implementation. - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; // Returns true if the preference is on the whitelist. bool IsPreferenceOnWhitelist(const std::string& pref_key); diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc index 68f0d7c..1eeb6f0 100644 --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc @@ -125,12 +125,12 @@ class IdentityPrefTransformer : public PrefTransformerInterface { public: virtual base::Value* ExtensionToBrowserPref(const base::Value* extension_pref, std::string* error, - bool* bad_message) OVERRIDE { + bool* bad_message) override { return extension_pref->DeepCopy(); } virtual base::Value* BrowserToExtensionPref( - const base::Value* browser_pref) OVERRIDE { + const base::Value* browser_pref) override { return browser_pref->DeepCopy(); } }; @@ -139,12 +139,12 @@ class InvertBooleanTransformer : public PrefTransformerInterface { public: virtual base::Value* ExtensionToBrowserPref(const base::Value* extension_pref, std::string* error, - bool* bad_message) OVERRIDE { + bool* bad_message) override { return InvertBooleanValue(extension_pref); } virtual base::Value* BrowserToExtensionPref( - const base::Value* browser_pref) OVERRIDE { + const base::Value* browser_pref) override { return InvertBooleanValue(browser_pref); } diff --git a/chrome/browser/extensions/api/preference/preference_api.h b/chrome/browser/extensions/api/preference/preference_api.h index abb7199..761febc 100644 --- a/chrome/browser/extensions/api/preference/preference_api.h +++ b/chrome/browser/extensions/api/preference/preference_api.h @@ -99,7 +99,7 @@ class PreferenceAPI : public PreferenceAPIBase, virtual ~PreferenceAPI(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<PreferenceAPI>* GetFactoryInstance(); @@ -108,22 +108,22 @@ class PreferenceAPI : public PreferenceAPIBase, static PreferenceAPI* Get(content::BrowserContext* context); // EventRouter::Observer implementation. - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; private: friend class BrowserContextKeyedAPIFactory<PreferenceAPI>; // ContentSettingsStore::Observer implementation. virtual void OnContentSettingChanged(const std::string& extension_id, - bool incognito) OVERRIDE; + bool incognito) override; // Clears incognito session-only content settings for all extensions. void ClearIncognitoSessionOnlyContentSettings(); // PreferenceAPIBase implementation. - virtual ExtensionPrefs* extension_prefs() OVERRIDE; - virtual ExtensionPrefValueMap* extension_pref_value_map() OVERRIDE; - virtual scoped_refptr<ContentSettingsStore> content_settings_store() OVERRIDE; + virtual ExtensionPrefs* extension_prefs() override; + virtual ExtensionPrefValueMap* extension_pref_value_map() override; + virtual scoped_refptr<ContentSettingsStore> content_settings_store() override; Profile* profile_; @@ -189,7 +189,7 @@ class GetPreferenceFunction : public PreferenceFunction { virtual ~GetPreferenceFunction(); // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class SetPreferenceFunction : public PreferenceFunction { @@ -200,7 +200,7 @@ class SetPreferenceFunction : public PreferenceFunction { virtual ~SetPreferenceFunction(); // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ClearPreferenceFunction : public PreferenceFunction { @@ -212,7 +212,7 @@ class ClearPreferenceFunction : public PreferenceFunction { virtual ~ClearPreferenceFunction(); // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc index 30ff398..058fb8f 100644 --- a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc +++ b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc @@ -49,14 +49,14 @@ class TestPreferenceAPI : public PreferenceAPIBase { private: // PreferenceAPIBase implementation. - virtual ExtensionPrefs* extension_prefs() OVERRIDE { + virtual ExtensionPrefs* extension_prefs() override { return test_extension_prefs_->prefs(); } - virtual ExtensionPrefValueMap* extension_pref_value_map() OVERRIDE { + virtual ExtensionPrefValueMap* extension_pref_value_map() override { return test_extension_prefs_->extension_pref_value_map(); } virtual scoped_refptr<ContentSettingsStore> content_settings_store() - OVERRIDE { + override { return content_settings_->content_settings_store(); } @@ -72,7 +72,7 @@ class ExtensionControlledPrefsTest : public PrefsPrepopulatedTestBase { virtual ~ExtensionControlledPrefsTest(); virtual void RegisterPreferences(user_prefs::PrefRegistrySyncable* registry) - OVERRIDE; + override; void InstallExtensionControlledPref(Extension* extension, const std::string& key, base::Value* value); @@ -194,12 +194,12 @@ void ExtensionControlledPrefsTest::EnsureExtensionUninstalled( class ControlledPrefsInstallOneExtension : public ExtensionControlledPrefsTest { - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { InstallExtensionControlledPref(extension1(), kPref1, new base::StringValue("val1")); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { std::string actual = prefs()->pref_service()->GetString(kPref1); EXPECT_EQ("val1", actual); } @@ -211,7 +211,7 @@ TEST_F(ControlledPrefsInstallOneExtension, class ControlledPrefsInstallIncognitoPersistent : public ExtensionControlledPrefsTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { InstallExtensionControlledPref( extension1(), kPref1, new base::StringValue("val1")); InstallExtensionControlledPrefIncognito( @@ -221,7 +221,7 @@ class ControlledPrefsInstallIncognitoPersistent EXPECT_EQ("val2", actual); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { // Main pref service shall see only non-incognito settings. std::string actual = prefs()->pref_service()->GetString(kPref1); EXPECT_EQ("val1", actual); @@ -240,7 +240,7 @@ class ControlledPrefsInstallIncognitoSessionOnly public: ControlledPrefsInstallIncognitoSessionOnly() : iteration_(0) {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { InstallExtensionControlledPref( extension1(), kPref1, new base::StringValue("val1")); InstallExtensionControlledPrefIncognitoSessionOnly( @@ -249,7 +249,7 @@ class ControlledPrefsInstallIncognitoSessionOnly std::string actual = incog_prefs->GetString(kPref1); EXPECT_EQ("val2", actual); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { // Main pref service shall see only non-incognito settings. std::string actual = prefs()->pref_service()->GetString(kPref1); EXPECT_EQ("val1", actual); @@ -271,7 +271,7 @@ TEST_F(ControlledPrefsInstallIncognitoSessionOnly, ControlledPrefsInstallIncognitoSessionOnly) { } class ControlledPrefsUninstallExtension : public ExtensionControlledPrefsTest { - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { InstallExtensionControlledPref( extension1(), kPref1, new base::StringValue("val1")); InstallExtensionControlledPref( @@ -288,7 +288,7 @@ class ControlledPrefsUninstallExtension : public ExtensionControlledPrefsTest { UninstallExtension(extension1()->id()); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { EXPECT_FALSE(prefs()->HasPrefForExtension(extension1()->id())); std::string actual; @@ -303,7 +303,7 @@ TEST_F(ControlledPrefsUninstallExtension, // Tests triggering of notifications to registered observers. class ControlledPrefsNotifyWhenNeeded : public ExtensionControlledPrefsTest { - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { using testing::_; using testing::Mock; using testing::StrEq; @@ -368,7 +368,7 @@ class ControlledPrefsNotifyWhenNeeded : public ExtensionControlledPrefsTest { registrar.Remove(kPref1); incognito_registrar.Remove(kPref1); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { std::string actual = prefs()->pref_service()->GetString(kPref1); EXPECT_EQ(kDefaultPref1, actual); } @@ -378,14 +378,14 @@ TEST_F(ControlledPrefsNotifyWhenNeeded, // Tests disabling an extension. class ControlledPrefsDisableExtension : public ExtensionControlledPrefsTest { - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { InstallExtensionControlledPref( extension1(), kPref1, new base::StringValue("val1")); std::string actual = prefs()->pref_service()->GetString(kPref1); EXPECT_EQ("val1", actual); prefs()->SetExtensionState(extension1()->id(), Extension::DISABLED); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { std::string actual = prefs()->pref_service()->GetString(kPref1); EXPECT_EQ(kDefaultPref1, actual); } @@ -394,13 +394,13 @@ TEST_F(ControlledPrefsDisableExtension, ControlledPrefsDisableExtension) { } // Tests disabling and reenabling an extension. class ControlledPrefsReenableExtension : public ExtensionControlledPrefsTest { - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { InstallExtensionControlledPref( extension1(), kPref1, new base::StringValue("val1")); prefs()->SetExtensionState(extension1()->id(), Extension::DISABLED); prefs()->SetExtensionState(extension1()->id(), Extension::ENABLED); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { std::string actual = prefs()->pref_service()->GetString(kPref1); EXPECT_EQ("val1", actual); } @@ -422,7 +422,7 @@ class MockStringValue : public base::StringValue { class ControlledPrefsSetExtensionControlledPref : public ExtensionControlledPrefsTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { MockStringValue* v1 = new MockStringValue("https://www.chromium.org"); MockStringValue* v2 = new MockStringValue("https://www.chromium.org"); MockStringValue* v1i = new MockStringValue("https://www.chromium.org"); @@ -448,7 +448,7 @@ class ControlledPrefsSetExtensionControlledPref testing::Mock::VerifyAndClearExpectations(v2i); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { } }; TEST_F(ControlledPrefsSetExtensionControlledPref, @@ -461,13 +461,13 @@ class ControlledPrefsDisableExtensions : public ExtensionControlledPrefsTest { ControlledPrefsDisableExtensions() : iteration_(0) {} virtual ~ControlledPrefsDisableExtensions() {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { InstallExtensionControlledPref( extension1(), kPref1, new base::StringValue("val1")); // This becomes only active in the second verification phase. prefs_.set_extensions_disabled(true); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { std::string actual = prefs()->pref_service()->GetString(kPref1); if (iteration_ == 0) { EXPECT_EQ("val1", actual); diff --git a/chrome/browser/extensions/api/preference/preference_apitest.cc b/chrome/browser/extensions/api/preference/preference_apitest.cc index 77a926d..4f58d93 100644 --- a/chrome/browser/extensions/api/preference/preference_apitest.cc +++ b/chrome/browser/extensions/api/preference/preference_apitest.cc @@ -69,7 +69,7 @@ class ExtensionPreferenceApiTest : public ExtensionApiTest { EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); // The browser might get closed later (and therefore be destroyed), so we @@ -82,7 +82,7 @@ class ExtensionPreferenceApiTest : public ExtensionApiTest { g_browser_process->AddRefModule(); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { // ReleaseBrowserProcessModule() needs to be called in a message loop, so we // post a task to do it, then run the message loop. base::MessageLoop::current()->PostTask( diff --git a/chrome/browser/extensions/api/preferences_private/preferences_private_api.h b/chrome/browser/extensions/api/preferences_private/preferences_private_api.h index e88d022..1189f45 100644 --- a/chrome/browser/extensions/api/preferences_private/preferences_private_api.h +++ b/chrome/browser/extensions/api/preferences_private/preferences_private_api.h @@ -26,10 +26,10 @@ class PreferencesPrivateGetSyncCategoriesWithoutPassphraseFunction private: // ProfileSyncServiceObserver: - virtual void OnStateChanged() OVERRIDE; + virtual void OnStateChanged() override; // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; DISALLOW_COPY_AND_ASSIGN( PreferencesPrivateGetSyncCategoriesWithoutPassphraseFunction); diff --git a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc index 3b8315d..e346157 100644 --- a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc +++ b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc @@ -66,12 +66,12 @@ class FakeProfileSyncService : public ProfileSyncService { bool initialized_state_violation() { return initialized_state_violation_; } // ProfileSyncService: - virtual bool sync_initialized() const OVERRIDE { + virtual bool sync_initialized() const override { return sync_initialized_; } virtual void AddObserver( - ProfileSyncServiceBase::Observer* observer) OVERRIDE { + ProfileSyncServiceBase::Observer* observer) override { if (sync_initialized_) initialized_state_violation_ = true; // Set sync initialized state to true so the function will run after @@ -83,7 +83,7 @@ class FakeProfileSyncService : public ProfileSyncService { base::Unretained(observer))); } - virtual syncer::ModelTypeSet GetEncryptedDataTypes() const OVERRIDE { + virtual syncer::ModelTypeSet GetEncryptedDataTypes() const override { if (!sync_initialized_) initialized_state_violation_ = true; syncer::ModelTypeSet type_set; @@ -91,7 +91,7 @@ class FakeProfileSyncService : public ProfileSyncService { return type_set; } - virtual syncer::ModelTypeSet GetPreferredDataTypes() const OVERRIDE { + virtual syncer::ModelTypeSet GetPreferredDataTypes() const override { if (!sync_initialized_) initialized_state_violation_ = true; syncer::ModelTypeSet preferred_types = @@ -114,14 +114,14 @@ class PreferencesPrivateApiTest : public ExtensionApiTest { PreferencesPrivateApiTest() : browser_(NULL), service_(NULL) {} virtual ~PreferencesPrivateApiTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { #if defined(OS_CHROMEOS) command_line->AppendSwitch( chromeos::switches::kIgnoreUserProfileMappingForTests); #endif } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); base::FilePath path; diff --git a/chrome/browser/extensions/api/principals_private/principals_private_api.h b/chrome/browser/extensions/api/principals_private/principals_private_api.h index eedb671..16f0ef0 100644 --- a/chrome/browser/extensions/api/principals_private/principals_private_api.h +++ b/chrome/browser/extensions/api/principals_private/principals_private_api.h @@ -24,7 +24,7 @@ class PrincipalsPrivateExtensionFunction : public ChromeSyncExtensionFunction { // ExtensionFunction: // Checks for the flag "new-profile-management", if set calls // RunSyncSafe which must be overriden by subclasses. - virtual bool RunSync() OVERRIDE FINAL; + virtual bool RunSync() override final; private: virtual bool RunSyncSafe() = 0; @@ -42,7 +42,7 @@ class PrincipalsPrivateSignOutFunction private: // PrincipalsPrivateExtensionFunction - virtual bool RunSyncSafe() OVERRIDE; + virtual bool RunSyncSafe() override; DISALLOW_COPY_AND_ASSIGN(PrincipalsPrivateSignOutFunction); }; @@ -59,7 +59,7 @@ class PrincipalsPrivateShowAvatarBubbleFunction private: // PrincipalsPrivateExtensionFunction - virtual bool RunSyncSafe() OVERRIDE; + virtual bool RunSyncSafe() override; DISALLOW_COPY_AND_ASSIGN(PrincipalsPrivateShowAvatarBubbleFunction); }; diff --git a/chrome/browser/extensions/api/processes/processes_api.h b/chrome/browser/extensions/api/processes/processes_api.h index dd89ca2..2963d3f 100644 --- a/chrome/browser/extensions/api/processes/processes_api.h +++ b/chrome/browser/extensions/api/processes/processes_api.h @@ -53,14 +53,14 @@ class ProcessesEventRouter : public TaskManagerModelObserver, // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // TaskManagerModelObserver methods. - virtual void OnItemsAdded(int start, int length) OVERRIDE; - virtual void OnModelChanged() OVERRIDE {} - virtual void OnItemsChanged(int start, int length) OVERRIDE; - virtual void OnItemsRemoved(int start, int length) OVERRIDE {} - virtual void OnItemsToBeRemoved(int start, int length) OVERRIDE; + virtual void OnItemsAdded(int start, int length) override; + virtual void OnModelChanged() override {} + virtual void OnItemsChanged(int start, int length) override; + virtual void OnItemsRemoved(int start, int length) override {} + virtual void OnItemsToBeRemoved(int start, int length) override; // Internal helpers for processing notifications. void ProcessHangEvent(content::RenderWidgetHost* widget); @@ -101,7 +101,7 @@ class ProcessesAPI : public BrowserContextKeyedAPI, virtual ~ProcessesAPI(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<ProcessesAPI>* GetFactoryInstance(); @@ -112,8 +112,8 @@ class ProcessesAPI : public BrowserContextKeyedAPI, ProcessesEventRouter* processes_event_router(); // EventRouter::Observer implementation. - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; - virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; + virtual void OnListenerRemoved(const EventListenerInfo& details) override; private: friend class BrowserContextKeyedAPIFactory<ProcessesAPI>; @@ -139,7 +139,7 @@ class GetProcessIdForTabFunction : public ChromeAsyncExtensionFunction { private: virtual ~GetProcessIdForTabFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void GetProcessIdForTab(); @@ -161,7 +161,7 @@ class TerminateFunction : public ChromeAsyncExtensionFunction { private: virtual ~TerminateFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void TerminateProcess(); @@ -180,7 +180,7 @@ class GetProcessInfoFunction : public ChromeAsyncExtensionFunction { private: virtual ~GetProcessInfoFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void GatherProcessInfo(); diff --git a/chrome/browser/extensions/api/proxy/proxy_api.h b/chrome/browser/extensions/api/proxy/proxy_api.h index 6d35047..aea100f 100644 --- a/chrome/browser/extensions/api/proxy/proxy_api.h +++ b/chrome/browser/extensions/api/proxy/proxy_api.h @@ -33,9 +33,9 @@ class ProxyPrefTransformer : public PrefTransformerInterface { // Implementation of PrefTransformerInterface. virtual base::Value* ExtensionToBrowserPref(const base::Value* extension_pref, std::string* error, - bool* bad_message) OVERRIDE; + bool* bad_message) override; virtual base::Value* BrowserToExtensionPref( - const base::Value* browser_pref) OVERRIDE; + const base::Value* browser_pref) override; private: DISALLOW_COPY_AND_ASSIGN(ProxyPrefTransformer); diff --git a/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h b/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h index bcb52b2..ee86840 100644 --- a/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h +++ b/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h @@ -49,15 +49,15 @@ class ObfuscatedGaiaIdFetcher : public OAuth2ApiCallFlow { protected: // OAuth2ApiCallFlow implementation - virtual GURL CreateApiCallUrl() OVERRIDE; - virtual std::string CreateApiCallBody() OVERRIDE; + virtual GURL CreateApiCallUrl() override; + virtual std::string CreateApiCallBody() override; virtual void ProcessApiCallSuccess( - const net::URLFetcher* source) OVERRIDE; + const net::URLFetcher* source) override; virtual void ProcessApiCallFailure( - const net::URLFetcher* source) OVERRIDE; - virtual void ProcessNewAccessToken(const std::string& access_token) OVERRIDE; + const net::URLFetcher* source) override; + virtual void ProcessNewAccessToken(const std::string& access_token) override; virtual void ProcessMintAccessTokenFailure( - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; private: FRIEND_TEST_ALL_PREFIXES(ObfuscatedGaiaIdFetcherTest, SetUp); diff --git a/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher_unittest.cc b/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher_unittest.cc index 6285747..e44aea5 100644 --- a/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher_unittest.cc +++ b/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher_unittest.cc @@ -21,11 +21,11 @@ static const char kNonDictionaryJsonData[] = "{ 0.5 }"; class TestDelegate : public extensions::ObfuscatedGaiaIdFetcher::Delegate { public: virtual void OnObfuscatedGaiaIdFetchSuccess( - const std::string& obfuscated_id) OVERRIDE { + const std::string& obfuscated_id) override { succeeded_ = true; } virtual void OnObfuscatedGaiaIdFetchFailure( - const GoogleServiceAuthError& error) OVERRIDE { + const GoogleServiceAuthError& error) override { failed_ = true; } TestDelegate() : succeeded_(false), failed_(false) {} diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.h b/chrome/browser/extensions/api/push_messaging/push_messaging_api.h index 26644d8..4da36f7 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.h +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.h @@ -45,7 +45,7 @@ class PushMessagingEventRouter // InvalidationHandlerDelegate implementation. virtual void OnMessage(const std::string& extension_id, int subchannel, - const std::string& payload) OVERRIDE; + const std::string& payload) override; content::BrowserContext* const browser_context_; @@ -64,7 +64,7 @@ class PushMessagingGetChannelIdFunction virtual ~PushMessagingGetChannelIdFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; DECLARE_EXTENSION_FUNCTION("pushMessaging.getChannelId", PUSHMESSAGING_GETCHANNELID) @@ -82,22 +82,22 @@ class PushMessagingGetChannelIdFunction void StartAccessTokenFetch(); // OAuth2TokenService::Observer implementation. - virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE; + virtual void OnRefreshTokenAvailable(const std::string& account_id) override; // OAuth2TokenService::Consumer implementation. virtual void OnGetTokenSuccess( const OAuth2TokenService::Request* request, const std::string& access_token, - const base::Time& expiration_time) OVERRIDE; + const base::Time& expiration_time) override; virtual void OnGetTokenFailure( const OAuth2TokenService::Request* request, - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; // ObfuscatedGiaiaIdFetcher::Delegate implementation. virtual void OnObfuscatedGaiaIdFetchSuccess(const std::string& gaia_id) - OVERRIDE; + override; virtual void OnObfuscatedGaiaIdFetchFailure( - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; scoped_ptr<ObfuscatedGaiaIdFetcher> fetcher_; bool interactive_; @@ -116,7 +116,7 @@ class PushMessagingAPI : public BrowserContextKeyedAPI, static PushMessagingAPI* Get(content::BrowserContext* context); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<PushMessagingAPI>* GetFactoryInstance(); @@ -141,17 +141,17 @@ class PushMessagingAPI : public BrowserContextKeyedAPI, // Overridden from ExtensionRegistryObserver. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; virtual void OnExtensionWillBeInstalled( content::BrowserContext* browser_context, const Extension* extension, bool is_update, bool from_ephemeral, - const std::string& old_name) OVERRIDE; + const std::string& old_name) override; // Initialize |event_router_| and |handler_|. bool InitEventRouterAndHandler(); diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc index 70cb356..183f6fd 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc @@ -73,17 +73,17 @@ class PushMessagingApiTest : public ExtensionApiTest { : fake_invalidation_service_(NULL) { } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { invalidation::ProfileInvalidationProviderFactory::GetInstance()-> RegisterTestingFactory(BuildFakeProfileInvalidationProvider); ExtensionApiTest::SetUp(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); fake_invalidation_service_ = static_cast<invalidation::FakeInvalidationService*>( diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc index 1be1505..07bd685 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc @@ -40,7 +40,7 @@ class PushMessagingCanaryTest : public ExtensionApiTest { virtual ~PushMessagingCanaryTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CommandLine* command_line = CommandLine::ForCurrentProcess(); ASSERT_TRUE(command_line->HasSwitch(kPasswordFileForTest)); @@ -74,7 +74,7 @@ class PushMessagingCanaryTest : public ExtensionApiTest { // InProcessBrowserTest override. Destroys the sync client and sync // profile created by the test. We must clean up ProfileSyncServiceHarness // now before the profile is cleaned up. - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { sync_setup_helper_.reset(); } @@ -85,13 +85,13 @@ class PushMessagingCanaryTest : public ExtensionApiTest { protected: // Override InProcessBrowserTest. Change behavior of the default host // resolver to avoid DNS lookup errors, so we can make network calls. - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { // The resolver object lifetime is managed by sync_test_setup, not here. EnableDNSLookupForThisTest( new net::RuleBasedHostResolverProc(host_resolver())); } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { DisableDNSLookupForThisTest(); } diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h index 179c30a..0f3ca9e 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h @@ -40,16 +40,16 @@ class PushMessagingInvalidationHandler : public PushMessagingInvalidationMapper, // PushMessagingInvalidationMapper implementation. virtual void SuppressInitialInvalidationsForExtension( - const std::string& extension_id) OVERRIDE; - virtual void RegisterExtension(const std::string& extension_id) OVERRIDE; - virtual void UnregisterExtension(const std::string& extension_id) OVERRIDE; + const std::string& extension_id) override; + virtual void RegisterExtension(const std::string& extension_id) override; + virtual void UnregisterExtension(const std::string& extension_id) override; // InvalidationHandler implementation. virtual void OnInvalidatorStateChange( - syncer::InvalidatorState state) OVERRIDE; + syncer::InvalidatorState state) override; virtual void OnIncomingInvalidation( - const syncer::ObjectIdInvalidationMap& invalidation_map) OVERRIDE; - virtual std::string GetOwnerName() const OVERRIDE; + const syncer::ObjectIdInvalidationMap& invalidation_map) override; + virtual std::string GetOwnerName() const override; const std::set<std::string>& GetRegisteredExtensionsForTest() const { return registered_extensions_; diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc index 9356075..8b2f8c1 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc @@ -67,7 +67,7 @@ MockInvalidationHandlerDelegate::~MockInvalidationHandlerDelegate() {} class PushMessagingInvalidationHandlerTest : public ::testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { syncer::InvalidationHandler* handler = NULL; EXPECT_CALL(service_, RegisterInvalidationHandler(NotNull())) .WillOnce(SaveArg<0>(&handler)); @@ -75,7 +75,7 @@ class PushMessagingInvalidationHandlerTest : public ::testing::Test { &service_, &delegate_)); EXPECT_EQ(handler_.get(), handler); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { EXPECT_CALL(service_, UnregisterInvalidationHandler(handler_.get())); handler_.reset(); } diff --git a/chrome/browser/extensions/api/reading_list_private/reading_list_private_api.h b/chrome/browser/extensions/api/reading_list_private/reading_list_private_api.h index bedc0fb..feed7b5 100644 --- a/chrome/browser/extensions/api/reading_list_private/reading_list_private_api.h +++ b/chrome/browser/extensions/api/reading_list_private/reading_list_private_api.h @@ -24,7 +24,7 @@ class ReadingListPrivateAddEntryFunction : public ChromeAsyncExtensionFunction { virtual ~ReadingListPrivateAddEntryFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class ReadingListPrivateRemoveEntryFunction @@ -37,7 +37,7 @@ class ReadingListPrivateRemoveEntryFunction virtual ~ReadingListPrivateRemoveEntryFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class ReadingListPrivateGetEntriesFunction @@ -50,7 +50,7 @@ class ReadingListPrivateGetEntriesFunction virtual ~ReadingListPrivateGetEntriesFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h index cdb6e7a..909b741 100644 --- a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h +++ b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h @@ -39,23 +39,23 @@ class ChromeRuntimeAPIDelegate : public extensions::RuntimeAPIDelegate, friend class extensions::RuntimeAPI; // extensions::RuntimeAPIDelegate implementation. - virtual void AddUpdateObserver(extensions::UpdateObserver* observer) OVERRIDE; + virtual void AddUpdateObserver(extensions::UpdateObserver* observer) override; virtual void RemoveUpdateObserver( - extensions::UpdateObserver* observer) OVERRIDE; + extensions::UpdateObserver* observer) override; virtual base::Version GetPreviousExtensionVersion( - const extensions::Extension* extension) OVERRIDE; - virtual void ReloadExtension(const std::string& extension_id) OVERRIDE; + const extensions::Extension* extension) override; + virtual void ReloadExtension(const std::string& extension_id) override; virtual bool CheckForUpdates(const std::string& extension_id, - const UpdateCheckCallback& callback) OVERRIDE; - virtual void OpenURL(const GURL& uninstall_url) OVERRIDE; + const UpdateCheckCallback& callback) override; + virtual void OpenURL(const GURL& uninstall_url) override; virtual bool GetPlatformInfo( - extensions::core_api::runtime::PlatformInfo* info) OVERRIDE; - virtual bool RestartDevice(std::string* error_message) OVERRIDE; + extensions::core_api::runtime::PlatformInfo* info) override; + virtual bool RestartDevice(std::string* error_message) override; // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; void UpdateCheckComplete(const std::string& extension_id); void CallUpdateCallbacks(const std::string& extension_id, diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h index dbdf8f4..1875eb7 100644 --- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h +++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h @@ -18,7 +18,7 @@ class ScreenlockPrivateGetLockedFunction : public ChromeAsyncExtensionFunction { DECLARE_EXTENSION_FUNCTION("screenlockPrivate.getLocked", SCREENLOCKPRIVATE_GETLOCKED) ScreenlockPrivateGetLockedFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: virtual ~ScreenlockPrivateGetLockedFunction(); @@ -30,7 +30,7 @@ class ScreenlockPrivateSetLockedFunction : public ChromeAsyncExtensionFunction { DECLARE_EXTENSION_FUNCTION("screenlockPrivate.setLocked", SCREENLOCKPRIVATE_SETLOCKED) ScreenlockPrivateSetLockedFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: virtual ~ScreenlockPrivateSetLockedFunction(); @@ -43,7 +43,7 @@ class ScreenlockPrivateAcceptAuthAttemptFunction DECLARE_EXTENSION_FUNCTION("screenlockPrivate.acceptAuthAttempt", SCREENLOCKPRIVATE_ACCEPTAUTHATTEMPT) ScreenlockPrivateAcceptAuthAttemptFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: virtual ~ScreenlockPrivateAcceptAuthAttemptFunction(); @@ -63,12 +63,12 @@ class ScreenlockPrivateEventRouter : public extensions::BrowserContextKeyedAPI, static extensions::BrowserContextKeyedAPIFactory< ScreenlockPrivateEventRouter>* GetFactoryInstance(); - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // ScreenlockBridge::Observer - virtual void OnScreenDidLock() OVERRIDE; - virtual void OnScreenDidUnlock() OVERRIDE; - virtual void OnFocusedUserChanged(const std::string& user_id) OVERRIDE; + virtual void OnScreenDidLock() override; + virtual void OnScreenDidUnlock() override; + virtual void OnFocusedUserChanged(const std::string& user_id) override; private: friend class extensions::BrowserContextKeyedAPIFactory< diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc b/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc index d68407f..535742b 100644 --- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc +++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc @@ -32,7 +32,7 @@ class ScreenlockPrivateApiTest : public ExtensionApiTest, virtual ~ScreenlockPrivateApiTest() {} // ExtensionApiTest - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( extensions::switches::kWhitelistedExtensionID, kTestExtensionId); @@ -43,7 +43,7 @@ class ScreenlockPrivateApiTest : public ExtensionApiTest, #endif } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { SigninManagerFactory::GetForProfile(profile()) ->SetAuthenticatedUsername(kTestUser); ExtensionApiTest::SetUpOnMainThread(); @@ -51,7 +51,7 @@ class ScreenlockPrivateApiTest : public ExtensionApiTest, protected: // ExtensionApiTest override: - virtual void RunTestOnMainThreadLoop() OVERRIDE { + virtual void RunTestOnMainThreadLoop() override { registrar_.Add(this, extensions::NOTIFICATION_EXTENSION_TEST_MESSAGE, content::NotificationService::AllSources()); @@ -62,7 +62,7 @@ class ScreenlockPrivateApiTest : public ExtensionApiTest, // content::NotificationObserver override: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { const std::string& content = *content::Details<std::string>(details).ptr(); if (content == kAttemptClickAuthMessage) { ScreenlockBridge::Get()->lock_handler()->SetAuthType( diff --git a/chrome/browser/extensions/api/sessions/sessions_api.h b/chrome/browser/extensions/api/sessions/sessions_api.h index da0305c..86c4c8b 100644 --- a/chrome/browser/extensions/api/sessions/sessions_api.h +++ b/chrome/browser/extensions/api/sessions/sessions_api.h @@ -29,7 +29,7 @@ class SessionId; class SessionsGetRecentlyClosedFunction : public ChromeSyncExtensionFunction { protected: virtual ~SessionsGetRecentlyClosedFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("sessions.getRecentlyClosed", SESSIONS_GETRECENTLYCLOSED) @@ -47,7 +47,7 @@ class SessionsGetRecentlyClosedFunction : public ChromeSyncExtensionFunction { class SessionsGetDevicesFunction : public ChromeSyncExtensionFunction { protected: virtual ~SessionsGetDevicesFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("sessions.getDevices", SESSIONS_GETDEVICES) private: @@ -68,7 +68,7 @@ class SessionsGetDevicesFunction : public ChromeSyncExtensionFunction { class SessionsRestoreFunction : public ChromeSyncExtensionFunction { protected: virtual ~SessionsRestoreFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("sessions.restore", SESSIONS_RESTORE) private: @@ -89,11 +89,11 @@ class SessionsEventRouter : public TabRestoreServiceObserver { // Observer callback for TabRestoreServiceObserver. Sends data on // recently closed tabs to the javascript side of this page to // display to the user. - virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE; + virtual void TabRestoreServiceChanged(TabRestoreService* service) override; // Observer callback to notice when our associated TabRestoreService // is destroyed. - virtual void TabRestoreServiceDestroyed(TabRestoreService* service) OVERRIDE; + virtual void TabRestoreServiceDestroyed(TabRestoreService* service) override; private: Profile* profile_; @@ -111,14 +111,14 @@ class SessionsAPI : public BrowserContextKeyedAPI, virtual ~SessionsAPI(); // BrowserContextKeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<SessionsAPI>* GetFactoryInstance(); // EventRouter::Observer implementation. virtual void OnListenerAdded(const extensions::EventListenerInfo& details) - OVERRIDE; + override; private: friend class BrowserContextKeyedAPIFactory<SessionsAPI>; diff --git a/chrome/browser/extensions/api/sessions/sessions_apitest.cc b/chrome/browser/extensions/api/sessions/sessions_apitest.cc index d25a1ca..db36a7d 100644 --- a/chrome/browser/extensions/api/sessions/sessions_apitest.cc +++ b/chrome/browser/extensions/api/sessions/sessions_apitest.cc @@ -84,8 +84,8 @@ void BuildTabSpecifics(const std::string& tag, int window_id, int tab_id, class ExtensionSessionsTest : public InProcessBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; + virtual void SetUpCommandLine(CommandLine* command_line) override; + virtual void SetUpOnMainThread() override; protected: static KeyedService* BuildProfileSyncService( content::BrowserContext* profile); diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h index e85da68..4c5db03 100644 --- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h +++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h @@ -43,14 +43,14 @@ class SettingsOverridesAPI : public BrowserContextKeyedAPI, // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; void OnTemplateURLsLoaded(); diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h index 8fa8775..c7c73bc 100644 --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h @@ -42,7 +42,7 @@ class SignedInDevicesGetFunction : public ChromeSyncExtensionFunction { virtual ~SignedInDevicesGetFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("signedInDevices.get", SIGNED_IN_DEVICES_GET) }; diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc index bcced2b..6a1e8d1 100644 --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc @@ -33,7 +33,7 @@ class MockDeviceInfoTracker : public DeviceInfoTracker { virtual ~MockDeviceInfoTracker() {} virtual scoped_ptr<DeviceInfo> GetDeviceInfo( - const std::string& client_id) const OVERRIDE { + const std::string& client_id) const override { NOTREACHED(); return scoped_ptr<DeviceInfo>(); } @@ -47,7 +47,7 @@ class MockDeviceInfoTracker : public DeviceInfoTracker { device_info->signin_scoped_device_id()); } - virtual ScopedVector<DeviceInfo> GetAllDeviceInfo() const OVERRIDE { + virtual ScopedVector<DeviceInfo> GetAllDeviceInfo() const override { ScopedVector<DeviceInfo> list; for (std::vector<const DeviceInfo*>::const_iterator iter = devices_.begin(); @@ -59,9 +59,9 @@ class MockDeviceInfoTracker : public DeviceInfoTracker { return list.Pass(); } - virtual void AddObserver(Observer* observer) OVERRIDE { NOTREACHED(); } + virtual void AddObserver(Observer* observer) override { NOTREACHED(); } - virtual void RemoveObserver(Observer* observer) OVERRIDE { NOTREACHED(); } + virtual void RemoveObserver(Observer* observer) override { NOTREACHED(); } void Add(const DeviceInfo* device) { devices_.push_back(device); } diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h index 7843739..2131670 100644 --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h @@ -44,7 +44,7 @@ class SignedInDevicesChangeObserver Profile* profile); virtual ~SignedInDevicesChangeObserver(); - virtual void OnDeviceInfoChange() OVERRIDE; + virtual void OnDeviceInfoChange() override; const std::string& extension_id() { return extension_id_; @@ -73,11 +73,11 @@ class SignedInDevicesManager : public BrowserContextKeyedAPI, virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // EventRouter::Observer: - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; - virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; + virtual void OnListenerRemoved(const EventListenerInfo& details) override; private: friend class BrowserContextKeyedAPIFactory<SignedInDevicesManager>; diff --git a/chrome/browser/extensions/api/socket/socket_apitest.cc b/chrome/browser/extensions/api/socket/socket_apitest.cc index 32e6267..60f50b2 100644 --- a/chrome/browser/extensions/api/socket/socket_apitest.cc +++ b/chrome/browser/extensions/api/socket/socket_apitest.cc @@ -33,12 +33,12 @@ class SocketApiTest : public ExtensionApiTest { new extensions::MockHostResolverCreator()) { } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( resolver_creator_->CreateMockHostResolver()); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { extensions::HostResolverWrapper::GetInstance()-> SetHostResolverForTesting(NULL); resolver_creator_->DeleteMockHostResolver(); diff --git a/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc b/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc index ccd4ad5..91f9b74 100644 --- a/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc +++ b/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc @@ -33,7 +33,7 @@ class MockTCPSocket : public net::TCPClientSocket { const net::CompletionCallback& callback)); MOCK_METHOD2(SetKeepAlive, bool(bool enable, int delay)); MOCK_METHOD1(SetNoDelay, bool(bool no_delay)); - virtual bool IsConnected() const OVERRIDE { + virtual bool IsConnected() const override { return true; } diff --git a/chrome/browser/extensions/api/socket/tls_socket_unittest.cc b/chrome/browser/extensions/api/socket/tls_socket_unittest.cc index 7ba8402..ec21c3c 100644 --- a/chrome/browser/extensions/api/socket/tls_socket_unittest.cc +++ b/chrome/browser/extensions/api/socket/tls_socket_unittest.cc @@ -69,7 +69,7 @@ class MockSSLClientSocket : public net::SSLClientSocket { MOCK_CONST_METHOD0(GetUnverifiedServerCertificateChain, scoped_refptr<net::X509Certificate>()); MOCK_CONST_METHOD0(GetChannelIDService, net::ChannelIDService*()); - virtual bool IsConnected() const OVERRIDE { return true; } + virtual bool IsConnected() const override { return true; } private: DISALLOW_COPY_AND_ASSIGN(MockSSLClientSocket); @@ -91,7 +91,7 @@ class MockTCPSocket : public net::TCPClientSocket { MOCK_METHOD2(SetKeepAlive, bool(bool enable, int delay)); MOCK_METHOD1(SetNoDelay, bool(bool no_delay)); - virtual bool IsConnected() const OVERRIDE { return true; } + virtual bool IsConnected() const override { return true; } private: DISALLOW_COPY_AND_ASSIGN(MockTCPSocket); diff --git a/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc b/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc index b38f175..85af659 100644 --- a/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc +++ b/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc @@ -38,12 +38,12 @@ class SocketsTcpApiTest : public ExtensionApiTest { new extensions::MockHostResolverCreator()) { } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( resolver_creator_->CreateMockHostResolver()); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { extensions::HostResolverWrapper::GetInstance()-> SetHostResolverForTesting(NULL); resolver_creator_->DeleteMockHostResolver(); diff --git a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc index a5eef79..ee939aa 100644 --- a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc +++ b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc @@ -46,12 +46,12 @@ class SocketsTcpServerApiTest : public ExtensionApiTest { new extensions::MockHostResolverCreator()) { } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( resolver_creator_->CreateMockHostResolver()); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { extensions::HostResolverWrapper::GetInstance()-> SetHostResolverForTesting(NULL); resolver_creator_->DeleteMockHostResolver(); diff --git a/chrome/browser/extensions/api/sockets_udp/sockets_udp_apitest.cc b/chrome/browser/extensions/api/sockets_udp/sockets_udp_apitest.cc index 9518da6..332f136 100644 --- a/chrome/browser/extensions/api/sockets_udp/sockets_udp_apitest.cc +++ b/chrome/browser/extensions/api/sockets_udp/sockets_udp_apitest.cc @@ -42,12 +42,12 @@ class SocketsUdpApiTest : public ExtensionApiTest { new extensions::MockHostResolverCreator()) { } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( resolver_creator_->CreateMockHostResolver()); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { extensions::HostResolverWrapper::GetInstance()-> SetHostResolverForTesting(NULL); resolver_creator_->DeleteMockHostResolver(); diff --git a/chrome/browser/extensions/api/spellcheck/spellcheck_api.h b/chrome/browser/extensions/api/spellcheck/spellcheck_api.h index 2405813..382f074 100644 --- a/chrome/browser/extensions/api/spellcheck/spellcheck_api.h +++ b/chrome/browser/extensions/api/spellcheck/spellcheck_api.h @@ -26,11 +26,11 @@ class SpellcheckAPI : public BrowserContextKeyedAPI, // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // BrowserContextKeyedAPI implementation. static const char* service_name() { diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc index 4ee4ee9..2454126 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc @@ -77,11 +77,11 @@ class ManagedValueStoreCache::ExtensionTracker const Extension* extension, bool is_update, bool from_ephemeral, - const std::string& old_name) OVERRIDE; + const std::string& old_name) override; virtual void OnExtensionUninstalled( content::BrowserContext* browser_context, const Extension* extension, - extensions::UninstallReason reason) OVERRIDE; + extensions::UninstallReason reason) override; // Handler for the signal from ExtensionSystem::ready(). void OnExtensionsReady(); diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.h b/chrome/browser/extensions/api/storage/managed_value_store_cache.h index ec44392..b33407c 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.h +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.h @@ -56,17 +56,17 @@ class ManagedValueStoreCache : public ValueStoreCache, PolicyValueStoreMap; // ValueStoreCache implementation: - virtual void ShutdownOnUI() OVERRIDE; + virtual void ShutdownOnUI() override; virtual void RunWithValueStoreForExtension( const StorageCallback& callback, - scoped_refptr<const Extension> extension) OVERRIDE; - virtual void DeleteStorageSoon(const std::string& extension_id) OVERRIDE; + scoped_refptr<const Extension> extension) override; + virtual void DeleteStorageSoon(const std::string& extension_id) override; // PolicyService::Observer implementation: - virtual void OnPolicyServiceInitialized(policy::PolicyDomain domain) OVERRIDE; + virtual void OnPolicyServiceInitialized(policy::PolicyDomain domain) override; virtual void OnPolicyUpdated(const policy::PolicyNamespace& ns, const policy::PolicyMap& previous, - const policy::PolicyMap& current) OVERRIDE; + const policy::PolicyMap& current) override; // Posted by OnPolicyUpdated() to update a PolicyValueStore on the FILE // thread. diff --git a/chrome/browser/extensions/api/storage/policy_value_store.h b/chrome/browser/extensions/api/storage/policy_value_store.h index bc14b97..ee2c55a 100644 --- a/chrome/browser/extensions/api/storage/policy_value_store.h +++ b/chrome/browser/extensions/api/storage/policy_value_store.h @@ -40,24 +40,24 @@ class PolicyValueStore : public ValueStore { void DeleteStorage(); // ValueStore implementation: - virtual size_t GetBytesInUse(const std::string& key) OVERRIDE; - virtual size_t GetBytesInUse(const std::vector<std::string>& keys) OVERRIDE; - virtual size_t GetBytesInUse() OVERRIDE; - virtual ReadResult Get(const std::string& key) OVERRIDE; - virtual ReadResult Get(const std::vector<std::string>& keys) OVERRIDE; - virtual ReadResult Get() OVERRIDE; + virtual size_t GetBytesInUse(const std::string& key) override; + virtual size_t GetBytesInUse(const std::vector<std::string>& keys) override; + virtual size_t GetBytesInUse() override; + virtual ReadResult Get(const std::string& key) override; + virtual ReadResult Get(const std::vector<std::string>& keys) override; + virtual ReadResult Get() override; virtual WriteResult Set( WriteOptions options, const std::string& key, - const base::Value& value) OVERRIDE; + const base::Value& value) override; virtual WriteResult Set( - WriteOptions options, const base::DictionaryValue& values) OVERRIDE; - virtual WriteResult Remove(const std::string& key) OVERRIDE; - virtual WriteResult Remove(const std::vector<std::string>& keys) OVERRIDE; - virtual WriteResult Clear() OVERRIDE; + WriteOptions options, const base::DictionaryValue& values) override; + virtual WriteResult Remove(const std::string& key) override; + virtual WriteResult Remove(const std::vector<std::string>& keys) override; + virtual WriteResult Clear() override; // Hopefully, as a Read-Only database, there is no reason to use these. - virtual bool Restore() OVERRIDE; - virtual bool RestoreKey(const std::string& key) OVERRIDE; + virtual bool Restore() override; + virtual bool RestoreKey(const std::string& key) override; // For unit tests. ValueStore* delegate() { return delegate_.get(); } diff --git a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc index 7dd88203..1af72db 100644 --- a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc +++ b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc @@ -50,24 +50,24 @@ class MutablePolicyValueStore : public PolicyValueStore { virtual WriteResult Set( WriteOptions options, const std::string& key, - const base::Value& value) OVERRIDE { + const base::Value& value) override { return delegate()->Set(options, key, value); } virtual WriteResult Set( - WriteOptions options, const base::DictionaryValue& values) OVERRIDE { + WriteOptions options, const base::DictionaryValue& values) override { return delegate()->Set(options, values); } - virtual WriteResult Remove(const std::string& key) OVERRIDE { + virtual WriteResult Remove(const std::string& key) override { return delegate()->Remove(key); } - virtual WriteResult Remove(const std::vector<std::string>& keys) OVERRIDE { + virtual WriteResult Remove(const std::vector<std::string>& keys) override { return delegate()->Remove(keys); } - virtual WriteResult Clear() OVERRIDE { + virtual WriteResult Clear() override { return delegate()->Clear(); } @@ -92,7 +92,7 @@ class PolicyValueStoreTest : public testing::Test { : file_thread_(content::BrowserThread::FILE, &loop_) {} virtual ~PolicyValueStoreTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir()); observers_ = new SettingsObserverList(); observers_->AddObserver(&observer_); @@ -103,7 +103,7 @@ class PolicyValueStoreTest : public testing::Test { new LeveldbValueStore(scoped_temp_dir_.path())))); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { observers_->RemoveObserver(&observer_); store_.reset(); } diff --git a/chrome/browser/extensions/api/storage/settings_apitest.cc b/chrome/browser/extensions/api/storage/settings_apitest.cc index 1a14f39..a1dc479 100644 --- a/chrome/browser/extensions/api/storage/settings_apitest.cc +++ b/chrome/browser/extensions/api/storage/settings_apitest.cc @@ -74,7 +74,7 @@ class MockSchemaRegistryObserver : public policy::SchemaRegistry::Observer { class ExtensionSettingsApiTest : public ExtensionApiTest { protected: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); #if defined(ENABLE_CONFIGURATION_POLICY) diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc index baa0def..f3d3564 100644 --- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc +++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc @@ -97,7 +97,7 @@ class MockSyncChangeProcessor : public syncer::SyncChangeProcessor { // syncer::SyncChangeProcessor implementation. virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const syncer::SyncChangeList& change_list) OVERRIDE { + const syncer::SyncChangeList& change_list) override { if (fail_all_requests_) { return syncer::SyncError( FROM_HERE, @@ -113,7 +113,7 @@ class MockSyncChangeProcessor : public syncer::SyncChangeProcessor { } virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const - OVERRIDE { + override { return syncer::SyncDataList(); } @@ -172,7 +172,7 @@ class TestingValueStoreFactory : public SettingsStorageFactory { // SettingsStorageFactory implementation. virtual ValueStore* Create(const base::FilePath& base_path, - const std::string& extension_id) OVERRIDE { + const std::string& extension_id) override { TestingValueStore* new_storage = new TestingValueStore(); DCHECK(!created_.count(extension_id)); created_[extension_id] = new_storage; @@ -183,7 +183,7 @@ class TestingValueStoreFactory : public SettingsStorageFactory { // any files. virtual void DeleteDatabaseIfExists( const base::FilePath& base_path, - const std::string& extension_id) OVERRIDE {} + const std::string& extension_id) override {} private: // SettingsStorageFactory is refcounted. @@ -206,7 +206,7 @@ class ExtensionSettingsSyncTest : public testing::Test { sync_processor_wrapper_(new syncer::SyncChangeProcessorWrapperForTest( sync_processor_.get())) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); profile_.reset(new TestingProfile(temp_dir_.path())); storage_factory_->Reset(new LeveldbSettingsStorageFactory()); @@ -219,7 +219,7 @@ class ExtensionSettingsSyncTest : public testing::Test { profile_.get(), &util::MockExtensionSystemWithEventRouter::Build); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { frontend_.reset(); profile_.reset(); // Execute any pending deletion tasks. diff --git a/chrome/browser/extensions/api/storage/sync_storage_backend.h b/chrome/browser/extensions/api/storage/sync_storage_backend.h index 72f954c..ad81677 100644 --- a/chrome/browser/extensions/api/storage/sync_storage_backend.h +++ b/chrome/browser/extensions/api/storage/sync_storage_backend.h @@ -52,16 +52,16 @@ class SyncStorageBackend : public syncer::SyncableService { // syncer::SyncableService implementation. virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) - const OVERRIDE; + const override; virtual syncer::SyncMergeResult MergeDataAndStartSyncing( syncer::ModelType type, const syncer::SyncDataList& initial_sync_data, scoped_ptr<syncer::SyncChangeProcessor> sync_processor, - scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE; + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) override; virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const syncer::SyncChangeList& change_list) OVERRIDE; - virtual void StopSyncing(syncer::ModelType type) OVERRIDE; + const syncer::SyncChangeList& change_list) override; + virtual void StopSyncing(syncer::ModelType type) override; private: // Gets a weak reference to the storage area for a given extension, diff --git a/chrome/browser/extensions/api/storage/sync_value_store_cache.h b/chrome/browser/extensions/api/storage/sync_value_store_cache.h index 0a66032..a66300c 100644 --- a/chrome/browser/extensions/api/storage/sync_value_store_cache.h +++ b/chrome/browser/extensions/api/storage/sync_value_store_cache.h @@ -41,8 +41,8 @@ class SyncValueStoreCache : public ValueStoreCache { // ValueStoreCache implementation: virtual void RunWithValueStoreForExtension( const StorageCallback& callback, - scoped_refptr<const Extension> extension) OVERRIDE; - virtual void DeleteStorageSoon(const std::string& extension_id) OVERRIDE; + scoped_refptr<const Extension> extension) override; + virtual void DeleteStorageSoon(const std::string& extension_id) override; private: void InitOnFileThread(const scoped_refptr<SettingsStorageFactory>& factory, diff --git a/chrome/browser/extensions/api/storage/syncable_settings_storage.h b/chrome/browser/extensions/api/storage/syncable_settings_storage.h index b6d6de4..b278aca 100644 --- a/chrome/browser/extensions/api/storage/syncable_settings_storage.h +++ b/chrome/browser/extensions/api/storage/syncable_settings_storage.h @@ -34,23 +34,23 @@ class SyncableSettingsStorage : public ValueStore { virtual ~SyncableSettingsStorage(); // ValueStore implementation. - virtual size_t GetBytesInUse(const std::string& key) OVERRIDE; - virtual size_t GetBytesInUse(const std::vector<std::string>& keys) OVERRIDE; - virtual size_t GetBytesInUse() OVERRIDE; - virtual ReadResult Get(const std::string& key) OVERRIDE; - virtual ReadResult Get(const std::vector<std::string>& keys) OVERRIDE; - virtual ReadResult Get() OVERRIDE; + virtual size_t GetBytesInUse(const std::string& key) override; + virtual size_t GetBytesInUse(const std::vector<std::string>& keys) override; + virtual size_t GetBytesInUse() override; + virtual ReadResult Get(const std::string& key) override; + virtual ReadResult Get(const std::vector<std::string>& keys) override; + virtual ReadResult Get() override; virtual WriteResult Set( WriteOptions options, const std::string& key, - const base::Value& value) OVERRIDE; + const base::Value& value) override; virtual WriteResult Set( - WriteOptions options, const base::DictionaryValue& values) OVERRIDE; - virtual WriteResult Remove(const std::string& key) OVERRIDE; - virtual WriteResult Remove(const std::vector<std::string>& keys) OVERRIDE; - virtual WriteResult Clear() OVERRIDE; - virtual bool Restore() OVERRIDE; - virtual bool RestoreKey(const std::string& key) OVERRIDE; + WriteOptions options, const base::DictionaryValue& values) override; + virtual WriteResult Remove(const std::string& key) override; + virtual WriteResult Remove(const std::vector<std::string>& keys) override; + virtual WriteResult Clear() override; + virtual bool Restore() override; + virtual bool RestoreKey(const std::string& key) override; // Sync-related methods, analogous to those on SyncableService (handled by // ExtensionSettings), but with looser guarantees about when the methods diff --git a/chrome/browser/extensions/api/streams_private/streams_private_api.h b/chrome/browser/extensions/api/streams_private/streams_private_api.h index c0494c9..2861041 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_api.h +++ b/chrome/browser/extensions/api/streams_private/streams_private_api.h @@ -58,7 +58,7 @@ class StreamsPrivateAPI : public BrowserContextKeyedAPI, virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // BrowserContextKeyedAPI implementation. static const char* service_name() { @@ -87,7 +87,7 @@ class StreamsPrivateAbortFunction : public UIThreadExtensionFunction { virtual ~StreamsPrivateAbortFunction() {} // ExtensionFunction: - virtual ExtensionFunction::ResponseAction Run() OVERRIDE; + virtual ExtensionFunction::ResponseAction Run() override; private: void OnClose(); diff --git a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc index 3805a38..16024fd 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc +++ b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc @@ -134,7 +134,7 @@ class StreamsPrivateApiTest : public ExtensionApiTest { virtual ~StreamsPrivateApiTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { // Init test server. test_server_.reset(new EmbeddedTestServer); ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady()); @@ -143,7 +143,7 @@ class StreamsPrivateApiTest : public ExtensionApiTest { ExtensionApiTest::SetUpOnMainThread(); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { // Tear down the test server. EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete()); test_server_.reset(); diff --git a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h index 42927d2..e50c9c6 100644 --- a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h +++ b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h @@ -36,19 +36,19 @@ class ExtensionSyncEventObserver : public sync_file_system::SyncEventObserver, sync_file_system::SyncFileSystemService* sync_service); // KeyedService override. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // sync_file_system::SyncEventObserver interface implementation. virtual void OnSyncStateUpdated( const GURL& app_origin, sync_file_system::SyncServiceState state, - const std::string& description) OVERRIDE; + const std::string& description) override; virtual void OnFileSynced(const storage::FileSystemURL& url, sync_file_system::SyncFileType file_type, sync_file_system::SyncFileStatus status, sync_file_system::SyncAction action, - sync_file_system::SyncDirection direction) OVERRIDE; + sync_file_system::SyncDirection direction) override; private: friend class BrowserContextKeyedAPIFactory<ExtensionSyncEventObserver>; diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h index 29a74ad..a8f90f7 100644 --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h @@ -31,7 +31,7 @@ class SyncFileSystemDeleteFileSystemFunction protected: virtual ~SyncFileSystemDeleteFileSystemFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void DidDeleteFileSystem(base::File::Error error); @@ -45,7 +45,7 @@ class SyncFileSystemGetFileStatusFunction protected: virtual ~SyncFileSystemGetFileStatusFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void DidGetFileStatus( @@ -62,7 +62,7 @@ class SyncFileSystemGetFileStatusesFunction protected: virtual ~SyncFileSystemGetFileStatusesFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: typedef std::pair<sync_file_system::SyncStatusCode, @@ -88,7 +88,7 @@ class SyncFileSystemGetUsageAndQuotaFunction protected: virtual ~SyncFileSystemGetUsageAndQuotaFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void DidGetUsageAndQuota(storage::QuotaStatusCode status, @@ -104,7 +104,7 @@ class SyncFileSystemRequestFileSystemFunction protected: virtual ~SyncFileSystemRequestFileSystemFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: typedef SyncFileSystemRequestFileSystemFunction self; @@ -125,7 +125,7 @@ class SyncFileSystemSetConflictResolutionPolicyFunction protected: virtual ~SyncFileSystemSetConflictResolutionPolicyFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class SyncFileSystemGetConflictResolutionPolicyFunction @@ -136,7 +136,7 @@ class SyncFileSystemGetConflictResolutionPolicyFunction protected: virtual ~SyncFileSystemGetConflictResolutionPolicyFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class SyncFileSystemGetServiceStatusFunction @@ -147,7 +147,7 @@ class SyncFileSystemGetServiceStatusFunction protected: virtual ~SyncFileSystemGetServiceStatusFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc index 3fa52a3..37b5a84 100644 --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc @@ -40,7 +40,7 @@ class SyncFileSystemApiTest : public ExtensionApiTest { real_minimum_preserved_space_(0), real_default_quota_(0) {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); real_minimum_preserved_space_ = @@ -54,7 +54,7 @@ class SyncFileSystemApiTest : public ExtensionApiTest { storage::QuotaManager::kSyncableStorageDefaultHostQuota = 123456; } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { storage::QuotaManager::kMinimumPreserveForSystem = real_minimum_preserved_space_; storage::QuotaManager::kSyncableStorageDefaultHostQuota = @@ -62,7 +62,7 @@ class SyncFileSystemApiTest : public ExtensionApiTest { ExtensionApiTest::TearDownInProcessBrowserTestFixture(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { // Must happen after the browser process is created because instantiating // the factory will instantiate ExtensionSystemFactory which depends on // ExtensionsBrowserClient setup in BrowserProcessImpl. diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc index 1ec43b5..268932b 100644 --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc @@ -35,7 +35,7 @@ class FakeDriveServiceFactory virtual scoped_ptr<drive::DriveServiceInterface> CreateDriveService( OAuth2TokenService* oauth2_token_service, net::URLRequestContextGetter* url_request_context_getter, - base::SequencedTaskRunner* blocking_task_runner) OVERRIDE { + base::SequencedTaskRunner* blocking_task_runner) override { scoped_ptr<drive::FakeDriveService> drive_service( new drive::FakeDriveService); drive_service->AddChangeObserver(change_observer_); @@ -59,14 +59,14 @@ class SyncFileSystemTest : public extensions::PlatformAppBrowserTest, remote_service_(NULL) { } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); real_minimum_preserved_space_ = storage::QuotaManager::kMinimumPreserveForSystem; storage::QuotaManager::kMinimumPreserveForSystem = 0; } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { storage::QuotaManager::kMinimumPreserveForSystem = real_minimum_preserved_space_; ExtensionApiTest::TearDownInProcessBrowserTestFixture(); @@ -81,7 +81,7 @@ class SyncFileSystemTest : public extensions::PlatformAppBrowserTest, base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ASSERT_TRUE(base_dir_.CreateUniqueTempDir()); SyncFileSystemServiceFactory* factory = @@ -116,7 +116,7 @@ class SyncFileSystemTest : public extensions::PlatformAppBrowserTest, } // drive::FakeDriveService::ChangeObserver override. - virtual void OnNewChangeAvailable() OVERRIDE { + virtual void OnNewChangeAvailable() override { sync_engine()->OnNotificationReceived(); } diff --git a/chrome/browser/extensions/api/synced_notifications_private/synced_notifications_private_api.h b/chrome/browser/extensions/api/synced_notifications_private/synced_notifications_private_api.h index ccdb9f8..da92847 100644 --- a/chrome/browser/extensions/api/synced_notifications_private/synced_notifications_private_api.h +++ b/chrome/browser/extensions/api/synced_notifications_private/synced_notifications_private_api.h @@ -20,7 +20,7 @@ class SyncedNotificationsPrivateGetInitialDataFunction protected: virtual ~SyncedNotificationsPrivateGetInitialDataFunction(); - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; private: DISALLOW_COPY_AND_ASSIGN(SyncedNotificationsPrivateGetInitialDataFunction); @@ -35,7 +35,7 @@ class SyncedNotificationsPrivateUpdateNotificationFunction protected: virtual ~SyncedNotificationsPrivateUpdateNotificationFunction(); - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; private: DISALLOW_COPY_AND_ASSIGN( @@ -51,7 +51,7 @@ class SyncedNotificationsPrivateSetRenderContextFunction protected: virtual ~SyncedNotificationsPrivateSetRenderContextFunction(); - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; private: DISALLOW_COPY_AND_ASSIGN(SyncedNotificationsPrivateSetRenderContextFunction); diff --git a/chrome/browser/extensions/api/synced_notifications_private/synced_notifications_shim.h b/chrome/browser/extensions/api/synced_notifications_private/synced_notifications_shim.h index 9d225ce..addbaa7 100644 --- a/chrome/browser/extensions/api/synced_notifications_private/synced_notifications_shim.h +++ b/chrome/browser/extensions/api/synced_notifications_private/synced_notifications_shim.h @@ -32,13 +32,13 @@ class SyncedNotificationsShim : public syncer::SyncableService { syncer::ModelType type, const syncer::SyncDataList& initial_sync_data, scoped_ptr<syncer::SyncChangeProcessor> sync_processor, - scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE; - virtual void StopSyncing(syncer::ModelType type) OVERRIDE; + scoped_ptr<syncer::SyncErrorFactory> error_handler) override; + virtual void StopSyncing(syncer::ModelType type) override; virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const syncer::SyncChangeList& change_list) OVERRIDE; + const syncer::SyncChangeList& change_list) override; virtual syncer::SyncDataList GetAllSyncData( - syncer::ModelType type) const OVERRIDE; + syncer::ModelType type) const override; // JS interface methods (see synced_notifications_private.h). bool GetInitialData( diff --git a/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc b/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc index cec720a..2db11d4 100644 --- a/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc +++ b/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc @@ -13,7 +13,7 @@ class MockCpuInfoProviderImpl : public CpuInfoProvider { public: MockCpuInfoProviderImpl() {} - virtual bool QueryInfo() OVERRIDE { + virtual bool QueryInfo() override { info_.num_of_processors = 4; info_.arch_name = "x86"; info_.model_name = "unknown"; @@ -41,7 +41,7 @@ class SystemCpuApiTest: public ExtensionApiTest { SystemCpuApiTest() {} virtual ~SystemCpuApiTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); } }; diff --git a/chrome/browser/extensions/api/system_display/system_display_apitest.cc b/chrome/browser/extensions/api/system_display/system_display_apitest.cc index c5a87ca..70c85c5 100644 --- a/chrome/browser/extensions/api/system_display/system_display_apitest.cc +++ b/chrome/browser/extensions/api/system_display/system_display_apitest.cc @@ -42,13 +42,13 @@ class MockScreen : public ash::ScreenAsh { protected: // Overridden from gfx::Screen: - virtual int GetNumDisplays() const OVERRIDE { + virtual int GetNumDisplays() const override { return displays_.size(); } - virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE { + virtual std::vector<gfx::Display> GetAllDisplays() const override { return displays_; } - virtual gfx::Display GetPrimaryDisplay() const OVERRIDE { + virtual gfx::Display GetPrimaryDisplay() const override { return displays_[0]; } @@ -73,38 +73,38 @@ class MockScreen : public Screen { protected: // Overridden from gfx::Screen: - virtual bool IsDIPEnabled() OVERRIDE { return true; } - virtual gfx::Point GetCursorScreenPoint() OVERRIDE { return gfx::Point(); } - virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE { + virtual bool IsDIPEnabled() override { return true; } + virtual gfx::Point GetCursorScreenPoint() override { return gfx::Point(); } + virtual gfx::NativeWindow GetWindowUnderCursor() override { return gfx::NativeWindow(); } virtual gfx::NativeWindow GetWindowAtScreenPoint( - const gfx::Point& point) OVERRIDE { + const gfx::Point& point) override { return gfx::NativeWindow(); } - virtual int GetNumDisplays() const OVERRIDE { + virtual int GetNumDisplays() const override { return displays_.size(); } - virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE { + virtual std::vector<gfx::Display> GetAllDisplays() const override { return displays_; } virtual gfx::Display GetDisplayNearestWindow( - gfx::NativeView window) const OVERRIDE { + gfx::NativeView window) const override { return gfx::Display(0); } virtual gfx::Display GetDisplayNearestPoint( - const gfx::Point& point) const OVERRIDE { + const gfx::Point& point) const override { return gfx::Display(0); } virtual gfx::Display GetDisplayMatching( - const gfx::Rect& match_rect) const OVERRIDE { + const gfx::Rect& match_rect) const override { return gfx::Display(0); } - virtual gfx::Display GetPrimaryDisplay() const OVERRIDE { + virtual gfx::Display GetPrimaryDisplay() const override { return displays_[0]; } - virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE {} - virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE {} + virtual void AddObserver(gfx::DisplayObserver* observer) override {} + virtual void RemoveObserver(gfx::DisplayObserver* observer) override {} private: std::vector<gfx::Display> displays_; @@ -122,7 +122,7 @@ class MockDisplayInfoProvider : public DisplayInfoProvider { virtual bool SetInfo( const std::string& display_id, const core_api::system_display::DisplayProperties& params, - std::string* error) OVERRIDE { + std::string* error) override { // Should get called only once per test case. EXPECT_FALSE(set_info_value_); set_info_value_ = params.ToValue(); @@ -130,7 +130,7 @@ class MockDisplayInfoProvider : public DisplayInfoProvider { return true; } - virtual gfx::Screen* GetActiveScreen() OVERRIDE { return NULL; } + virtual gfx::Screen* GetActiveScreen() override { return NULL; } scoped_ptr<base::DictionaryValue> GetSetInfoValue() { return set_info_value_.Pass(); @@ -145,7 +145,7 @@ class MockDisplayInfoProvider : public DisplayInfoProvider { // platform specific method. virtual void UpdateDisplayUnitInfoForPlatform( const gfx::Display& display, - extensions::core_api::system_display::DisplayUnitInfo* unit) OVERRIDE { + extensions::core_api::system_display::DisplayUnitInfo* unit) override { int64 id = display.id(); unit->name = "DISPLAY NAME FOR " + base::Int64ToString(id); if (id == 1) @@ -177,7 +177,7 @@ class SystemDisplayApiTest: public ExtensionApiTest { virtual ~SystemDisplayApiTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); ANNOTATE_LEAKING_OBJECT_PTR( gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE)); @@ -185,7 +185,7 @@ class SystemDisplayApiTest: public ExtensionApiTest { DisplayInfoProvider::InitializeForTesting(provider_.get()); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { #if defined(OS_CHROMEOS) gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, ash::Shell::GetScreen()); diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc index ec35a40..a1d7e1c 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc @@ -16,7 +16,7 @@ class SystemIndicatorApiTest : public ExtensionApiTest { public: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); // Set shorter delays to prevent test timeouts in tests that need to wait // for the event page to unload. diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc index e5f45fdf..ac56518 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc @@ -36,10 +36,10 @@ class ExtensionIndicatorIcon : public StatusIconObserver, virtual ~ExtensionIndicatorIcon(); // StatusIconObserver implementation. - virtual void OnStatusIconClicked() OVERRIDE; + virtual void OnStatusIconClicked() override; // ExtensionActionIconFactory::Observer implementation. - virtual void OnIconUpdated() OVERRIDE; + virtual void OnIconUpdated() override; private: ExtensionIndicatorIcon(const Extension* extension, diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h index 719144e..a542bdc 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h @@ -37,7 +37,7 @@ class SystemIndicatorManager : public ExtensionRegistryObserver, virtual ~SystemIndicatorManager(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; private: FRIEND_TEST_ALL_PREFIXES(::SystemIndicatorApiTest, SystemIndicator); @@ -46,13 +46,13 @@ class SystemIndicatorManager : public ExtensionRegistryObserver, virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // ExtensionActionAPI::Observer implementation. virtual void OnExtensionActionUpdated( ExtensionAction* extension_action, content::WebContents* web_contents, - content::BrowserContext* browser_context) OVERRIDE; + content::BrowserContext* browser_context) override; // Causes a call to OnStatusIconClicked for the specified extension_id. // Returns false if no ExtensionIndicatorIcon is found for the extension. diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h b/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h index 0a88e75..365e5d9 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h @@ -28,7 +28,7 @@ class SystemIndicatorManagerFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedBaseFactory implementation. virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc b/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc index 121ae43..5d0af3a 100644 --- a/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc +++ b/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc @@ -14,7 +14,7 @@ class MockMemoryInfoProviderImpl : public MemoryInfoProvider { public: MockMemoryInfoProviderImpl() {} - virtual bool QueryInfo() OVERRIDE { + virtual bool QueryInfo() override { info_.capacity = 4096; info_.available_capacity = 1024; return true; @@ -28,7 +28,7 @@ class SystemMemoryApiTest: public ExtensionApiTest { SystemMemoryApiTest() {} virtual ~SystemMemoryApiTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); message_loop_.reset(new base::MessageLoopForUI); } diff --git a/chrome/browser/extensions/api/system_private/system_private_api.h b/chrome/browser/extensions/api/system_private/system_private_api.h index e0d8d4c..bebd362 100644 --- a/chrome/browser/extensions/api/system_private/system_private_api.h +++ b/chrome/browser/extensions/api/system_private/system_private_api.h @@ -22,7 +22,7 @@ class SystemPrivateGetIncognitoModeAvailabilityFunction virtual ~SystemPrivateGetIncognitoModeAvailabilityFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // API function which returns the status of system update. @@ -36,7 +36,7 @@ class SystemPrivateGetUpdateStatusFunction virtual ~SystemPrivateGetUpdateStatusFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // API function which returns the Google API key. @@ -48,7 +48,7 @@ class SystemPrivateGetApiKeyFunction : public SyncExtensionFunction { virtual ~SystemPrivateGetApiKeyFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; // Dispatches systemPrivate.onBrightnessChanged event for extensions. diff --git a/chrome/browser/extensions/api/system_private/system_private_apitest.cc b/chrome/browser/extensions/api/system_private/system_private_apitest.cc index f0f01f8c..784411c 100644 --- a/chrome/browser/extensions/api/system_private/system_private_apitest.cc +++ b/chrome/browser/extensions/api/system_private/system_private_apitest.cc @@ -29,14 +29,14 @@ class GetUpdateStatusApiTest : public ExtensionApiTest { public: GetUpdateStatusApiTest() : fake_update_engine_client_(NULL) {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); fake_update_engine_client_ = new chromeos::FakeUpdateEngineClient; chromeos::DBusThreadManager::GetSetterForTesting()->SetUpdateEngineClient( scoped_ptr<UpdateEngineClient>(fake_update_engine_client_)); } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { ExtensionApiTest::TearDownInProcessBrowserTestFixture(); } diff --git a/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc b/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc index 1a98c1c..f5a4985 100644 --- a/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc +++ b/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc @@ -40,7 +40,7 @@ class TestStorageInfoProvider : public extensions::StorageInfoProvider { // StorageInfoProvider implementations. virtual double GetStorageFreeSpaceFromTransientIdOnFileThread( - const std::string& transient_id) OVERRIDE; + const std::string& transient_id) override; std::vector<struct TestStorageUnitInfo> testing_data_; }; @@ -71,11 +71,11 @@ class SystemStorageApiTest : public ExtensionApiTest { SystemStorageApiTest() {} virtual ~SystemStorageApiTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { TestStorageMonitor::CreateForBrowserTests(); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); message_loop_.reset(new base::MessageLoopForUI); } diff --git a/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc b/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc index 6ef8bc6..c2bad34 100644 --- a/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc +++ b/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc @@ -36,7 +36,7 @@ class SystemStorageEjectApiTest : public ExtensionApiTest { virtual ~SystemStorageEjectApiTest() {} protected: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { monitor_ = TestStorageMonitor::CreateForBrowserTests(); ExtensionApiTest::SetUpOnMainThread(); } diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_api.h b/chrome/browser/extensions/api/tab_capture/tab_capture_api.h index 23c163c..a13f1bb 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_api.h +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_api.h @@ -22,7 +22,7 @@ class TabCaptureCaptureFunction : public ChromeSyncExtensionFunction { virtual ~TabCaptureCaptureFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class TabCaptureGetCapturedTabsFunction : public ChromeSyncExtensionFunction { @@ -34,7 +34,7 @@ class TabCaptureGetCapturedTabsFunction : public ChromeSyncExtensionFunction { virtual ~TabCaptureGetCapturedTabsFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc index 05d6439..4913d80 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc @@ -41,7 +41,7 @@ class TabCaptureApiTest : public ExtensionApiTest { class TabCaptureApiPixelTest : public TabCaptureApiTest { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EnablePixelOutput(); TabCaptureApiTest::SetUp(); } diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc index 5e8c8fd..8efa51a 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc @@ -98,12 +98,12 @@ class TabCapturePerformanceTest return suffix; } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EnablePixelOutput(); ExtensionApiTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { if (!ScalingMethod().empty()) { command_line->AppendSwitchASCII(switches::kTabCaptureUpscaleQuality, ScalingMethod()); diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc index 7e1a605..0ea0233 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc @@ -96,25 +96,25 @@ class TabCaptureRegistry::LiveRequest : public content::WebContentsObserver { } protected: - virtual void DidShowFullscreenWidget(int routing_id) OVERRIDE { + virtual void DidShowFullscreenWidget(int routing_id) override { is_fullscreened_ = true; if (capture_state_ == tab_capture::TAB_CAPTURE_STATE_ACTIVE) registry_->DispatchStatusChangeEvent(this); } - virtual void DidDestroyFullscreenWidget(int routing_id) OVERRIDE { + virtual void DidDestroyFullscreenWidget(int routing_id) override { is_fullscreened_ = false; if (capture_state_ == tab_capture::TAB_CAPTURE_STATE_ACTIVE) registry_->DispatchStatusChangeEvent(this); } - virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) OVERRIDE { + virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) override { is_fullscreened_ = entered_fullscreen; if (capture_state_ == tab_capture::TAB_CAPTURE_STATE_ACTIVE) registry_->DispatchStatusChangeEvent(this); } - virtual void WebContentsDestroyed() OVERRIDE { + virtual void WebContentsDestroyed() override { registry_->KillRequest(this); // Deletes |this|. } diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h index 49f7379..6ff320f 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h @@ -82,14 +82,14 @@ class TabCaptureRegistry : public BrowserContextKeyedAPI, virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // MediaCaptureDevicesDispatcher::Observer implementation. virtual void OnRequestUpdate( int original_target_render_process_id, int original_target_render_frame_id, content::MediaStreamType stream_type, - const content::MediaRequestState state) OVERRIDE; + const content::MediaRequestState state) override; // Send a StatusChanged event containing the current state of |request|. void DispatchStatusChangeEvent(const LiveRequest* request) const; diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc index 346b688..408ec24 100644 --- a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc +++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc @@ -38,17 +38,17 @@ class AshPanelWindowController : public extensions::WindowController { void NativeWindowChanged(); // Overridden from extensions::WindowController. - virtual int GetWindowId() const OVERRIDE; - virtual std::string GetWindowTypeText() const OVERRIDE; + virtual int GetWindowId() const override; + virtual std::string GetWindowTypeText() const override; virtual base::DictionaryValue* CreateWindowValueWithTabs( - const extensions::Extension* extension) const OVERRIDE; + const extensions::Extension* extension) const override; virtual base::DictionaryValue* CreateTabValue( - const extensions::Extension* extension, int tab_index) const OVERRIDE; - virtual bool CanClose(Reason* reason) const OVERRIDE; + const extensions::Extension* extension, int tab_index) const override; + virtual bool CanClose(Reason* reason) const override; virtual void SetFullscreenMode(bool is_fullscreen, - const GURL& extension_url) const OVERRIDE; + const GURL& extension_url) const override; virtual bool IsVisibleToExtension( - const extensions::Extension* extension) const OVERRIDE; + const extensions::Extension* extension) const override; private: AppWindow* app_window_; // Weak pointer; this is owned by app_window_ diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.h b/chrome/browser/extensions/api/tabs/ash_panel_contents.h index 8384464..58565aa 100644 --- a/chrome/browser/extensions/api/tabs/ash_panel_contents.h +++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.h @@ -41,21 +41,21 @@ class AshPanelContents // extensions::AppWindowContents virtual void Initialize(content::BrowserContext* context, - const GURL& url) OVERRIDE; - virtual void LoadContents(int32 creator_process_id) OVERRIDE; + const GURL& url) override; + virtual void LoadContents(int32 creator_process_id) override; virtual void NativeWindowChanged( - extensions::NativeAppWindow* native_app_window) OVERRIDE; - virtual void NativeWindowClosed() OVERRIDE; - virtual void DispatchWindowShownForTests() const OVERRIDE; - virtual content::WebContents* GetWebContents() const OVERRIDE; + extensions::NativeAppWindow* native_app_window) override; + virtual void NativeWindowClosed() override; + virtual void DispatchWindowShownForTests() const override; + virtual content::WebContents* GetWebContents() const override; // LauncherFaviconLoader::Delegate overrides: - virtual void FaviconUpdated() OVERRIDE; + virtual void FaviconUpdated() override; // extensions::ExtensionFunctionDispatcher::Delegate virtual extensions::WindowController* GetExtensionWindowController() const - OVERRIDE; - virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE; + override; + virtual content::WebContents* GetAssociatedWebContents() const override; LauncherFaviconLoader* launcher_favicon_loader_for_test() { return launcher_favicon_loader_.get(); @@ -63,7 +63,7 @@ class AshPanelContents private: // content::WebContentsObserver - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnRequest(const ExtensionHostMsg_Request_Params& params); diff --git a/chrome/browser/extensions/api/tabs/tabs_api.h b/chrome/browser/extensions/api/tabs/tabs_api.h index 85d4e61..099ec20 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.h +++ b/chrome/browser/extensions/api/tabs/tabs_api.h @@ -50,27 +50,27 @@ void ZoomModeToZoomSettings(ZoomController::ZoomMode zoom_mode, // Windows class WindowsGetFunction : public ChromeSyncExtensionFunction { virtual ~WindowsGetFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("windows.get", WINDOWS_GET) }; class WindowsGetCurrentFunction : public ChromeSyncExtensionFunction { virtual ~WindowsGetCurrentFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("windows.getCurrent", WINDOWS_GETCURRENT) }; class WindowsGetLastFocusedFunction : public ChromeSyncExtensionFunction { virtual ~WindowsGetLastFocusedFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("windows.getLastFocused", WINDOWS_GETLASTFOCUSED) }; class WindowsGetAllFunction : public ChromeSyncExtensionFunction { virtual ~WindowsGetAllFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("windows.getAll", WINDOWS_GETALL) }; class WindowsCreateFunction : public ChromeSyncExtensionFunction { virtual ~WindowsCreateFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; // Returns whether the window should be created in incognito mode. // |create_data| are the options passed by the extension. It may be NULL. // |urls| is the list of urls to open. If we are creating an incognito window, @@ -86,54 +86,54 @@ class WindowsCreateFunction : public ChromeSyncExtensionFunction { }; class WindowsUpdateFunction : public ChromeSyncExtensionFunction { virtual ~WindowsUpdateFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("windows.update", WINDOWS_UPDATE) }; class WindowsRemoveFunction : public ChromeSyncExtensionFunction { virtual ~WindowsRemoveFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("windows.remove", WINDOWS_REMOVE) }; // Tabs class TabsGetFunction : public ChromeSyncExtensionFunction { virtual ~TabsGetFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("tabs.get", TABS_GET) }; class TabsGetCurrentFunction : public ChromeSyncExtensionFunction { virtual ~TabsGetCurrentFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("tabs.getCurrent", TABS_GETCURRENT) }; class TabsGetSelectedFunction : public ChromeSyncExtensionFunction { virtual ~TabsGetSelectedFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("tabs.getSelected", TABS_GETSELECTED) }; class TabsGetAllInWindowFunction : public ChromeSyncExtensionFunction { virtual ~TabsGetAllInWindowFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("tabs.getAllInWindow", TABS_GETALLINWINDOW) }; class TabsQueryFunction : public ChromeSyncExtensionFunction { virtual ~TabsQueryFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("tabs.query", TABS_QUERY) }; class TabsCreateFunction : public ChromeSyncExtensionFunction { virtual ~TabsCreateFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("tabs.create", TABS_CREATE) }; class TabsDuplicateFunction : public ChromeSyncExtensionFunction { virtual ~TabsDuplicateFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("tabs.duplicate", TABS_DUPLICATE) }; class TabsHighlightFunction : public ChromeSyncExtensionFunction { virtual ~TabsHighlightFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; bool HighlightTab(TabStripModel* tabstrip, ui::ListSelectionModel* selection, int *active_index, @@ -154,7 +154,7 @@ class TabsUpdateFunction : public ChromeAsyncExtensionFunction { content::WebContents* web_contents_; private: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void OnExecuteCodeFinished(const std::string& error, const GURL& on_url, const base::ListValue& script_result); @@ -163,7 +163,7 @@ class TabsUpdateFunction : public ChromeAsyncExtensionFunction { }; class TabsMoveFunction : public ChromeSyncExtensionFunction { virtual ~TabsMoveFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; bool MoveTab(int tab_id, int* new_index, int iteration, @@ -173,12 +173,12 @@ class TabsMoveFunction : public ChromeSyncExtensionFunction { }; class TabsReloadFunction : public ChromeSyncExtensionFunction { virtual ~TabsReloadFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("tabs.reload", TABS_RELOAD) }; class TabsRemoveFunction : public ChromeSyncExtensionFunction { virtual ~TabsRemoveFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; bool RemoveTab(int tab_id); DECLARE_EXTENSION_FUNCTION("tabs.remove", TABS_REMOVE) }; @@ -186,11 +186,11 @@ class TabsDetectLanguageFunction : public ChromeAsyncExtensionFunction, public content::NotificationObserver { private: virtual ~TabsDetectLanguageFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; void GotLanguage(const std::string& language); content::NotificationRegistrar registrar_; DECLARE_EXTENSION_FUNCTION("tabs.detectLanguage", TABS_DETECTLANGUAGE) @@ -208,9 +208,9 @@ class TabsCaptureVisibleTabFunction ChromeExtensionFunctionDetails chrome_details_; // extensions::CaptureWebContentsFunction: - virtual bool IsScreenshotEnabled() OVERRIDE; - virtual content::WebContents* GetWebContentsForID(int id) OVERRIDE; - virtual void OnCaptureFailure(FailureReason reason) OVERRIDE; + virtual bool IsScreenshotEnabled() override; + virtual content::WebContents* GetWebContentsForID(int id) override; + virtual void OnCaptureFailure(FailureReason reason) override; DECLARE_EXTENSION_FUNCTION("tabs.captureVisibleTab", TABS_CAPTUREVISIBLETAB) }; @@ -224,15 +224,15 @@ class ExecuteCodeInTabFunction : public ExecuteCodeFunction { virtual ~ExecuteCodeInTabFunction(); // ExtensionFunction: - virtual bool HasPermission() OVERRIDE; + virtual bool HasPermission() override; // Initialize the |execute_tab_id_| and |details_| if they haven't already // been. Returns whether initialization was successful. - virtual bool Init() OVERRIDE; - virtual bool CanExecuteScriptOnPage() OVERRIDE; - virtual ScriptExecutor* GetScriptExecutor() OVERRIDE; - virtual bool IsWebView() const OVERRIDE; - virtual const GURL& GetWebViewSrc() const OVERRIDE; + virtual bool Init() override; + virtual bool CanExecuteScriptOnPage() override; + virtual ScriptExecutor* GetScriptExecutor() override; + virtual bool IsWebView() const override; + virtual const GURL& GetWebViewSrc() const override; private: const ChromeExtensionFunctionDetails chrome_details_; @@ -243,7 +243,7 @@ class ExecuteCodeInTabFunction : public ExecuteCodeFunction { class TabsExecuteScriptFunction : public ExecuteCodeInTabFunction { protected: - virtual bool ShouldInsertCSS() const OVERRIDE; + virtual bool ShouldInsertCSS() const override; private: virtual ~TabsExecuteScriptFunction() {} @@ -251,7 +251,7 @@ class TabsExecuteScriptFunction : public ExecuteCodeInTabFunction { virtual void OnExecuteCodeFinished( const std::string& error, const GURL& on_url, - const base::ListValue& script_result) OVERRIDE; + const base::ListValue& script_result) override; DECLARE_EXTENSION_FUNCTION("tabs.executeScript", TABS_EXECUTESCRIPT) }; @@ -260,7 +260,7 @@ class TabsInsertCSSFunction : public ExecuteCodeInTabFunction { private: virtual ~TabsInsertCSSFunction() {} - virtual bool ShouldInsertCSS() const OVERRIDE; + virtual bool ShouldInsertCSS() const override; DECLARE_EXTENSION_FUNCTION("tabs.insertCSS", TABS_INSERTCSS) }; @@ -282,7 +282,7 @@ class TabsSetZoomFunction : public ZoomAPIFunction { private: virtual ~TabsSetZoomFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; DECLARE_EXTENSION_FUNCTION("tabs.setZoom", TABS_SETZOOM) }; @@ -291,7 +291,7 @@ class TabsGetZoomFunction : public ZoomAPIFunction { private: virtual ~TabsGetZoomFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; DECLARE_EXTENSION_FUNCTION("tabs.getZoom", TABS_GETZOOM) }; @@ -300,7 +300,7 @@ class TabsSetZoomSettingsFunction : public ZoomAPIFunction { private: virtual ~TabsSetZoomSettingsFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; DECLARE_EXTENSION_FUNCTION("tabs.setZoomSettings", TABS_SETZOOMSETTINGS) }; @@ -309,7 +309,7 @@ class TabsGetZoomSettingsFunction : public ZoomAPIFunction { private: virtual ~TabsGetZoomSettingsFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; DECLARE_EXTENSION_FUNCTION("tabs.getZoomSettings", TABS_GETZOOMSETTINGS) }; diff --git a/chrome/browser/extensions/api/tabs/tabs_event_router.h b/chrome/browser/extensions/api/tabs/tabs_event_router.h index b5ec372..eaa25c0 100644 --- a/chrome/browser/extensions/api/tabs/tabs_event_router.h +++ b/chrome/browser/extensions/api/tabs/tabs_event_router.h @@ -36,46 +36,46 @@ class TabsEventRouter : public TabStripModelObserver, virtual ~TabsEventRouter(); // chrome::BrowserListObserver - virtual void OnBrowserAdded(Browser* browser) OVERRIDE; - virtual void OnBrowserRemoved(Browser* browser) OVERRIDE; - virtual void OnBrowserSetLastActive(Browser* browser) OVERRIDE; + virtual void OnBrowserAdded(Browser* browser) override; + virtual void OnBrowserRemoved(Browser* browser) override; + virtual void OnBrowserSetLastActive(Browser* browser) override; // TabStripModelObserver virtual void TabInsertedAt(content::WebContents* contents, int index, - bool active) OVERRIDE; + bool active) override; virtual void TabClosingAt(TabStripModel* tab_strip_model, content::WebContents* contents, - int index) OVERRIDE; + int index) override; virtual void TabDetachedAt(content::WebContents* contents, - int index) OVERRIDE; + int index) override; virtual void ActiveTabChanged(content::WebContents* old_contents, content::WebContents* new_contents, int index, - int reason) OVERRIDE; + int reason) override; virtual void TabSelectionChanged( TabStripModel* tab_strip_model, - const ui::ListSelectionModel& old_model) OVERRIDE; + const ui::ListSelectionModel& old_model) override; virtual void TabMoved(content::WebContents* contents, int from_index, - int to_index) OVERRIDE; + int to_index) override; virtual void TabChangedAt(content::WebContents* contents, int index, - TabChangeType change_type) OVERRIDE; + TabChangeType change_type) override; virtual void TabReplacedAt(TabStripModel* tab_strip_model, content::WebContents* old_contents, content::WebContents* new_contents, - int index) OVERRIDE; + int index) override; virtual void TabPinnedStateChanged(content::WebContents* contents, - int index) OVERRIDE; + int index) override; // content::NotificationObserver. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // ZoomObserver. virtual void OnZoomChanged( - const ZoomController::ZoomChangedEventData& data) OVERRIDE; + const ZoomController::ZoomChangedEventData& data) override; private: // "Synthetic" event. Called from TabInsertedAt if new tab is detected. diff --git a/chrome/browser/extensions/api/tabs/tabs_test.cc b/chrome/browser/extensions/api/tabs/tabs_test.cc index cd55290..5c80e0c 100644 --- a/chrome/browser/extensions/api/tabs/tabs_test.cc +++ b/chrome/browser/extensions/api/tabs/tabs_test.cc @@ -599,7 +599,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DuplicateTabNoPermission) { // Tester class for the tabs.zoom* api functions. class ExtensionTabsZoomTest : public ExtensionTabsTest { public: - virtual void SetUpOnMainThread() OVERRIDE; + virtual void SetUpOnMainThread() override; // Runs chrome.tabs.setZoom(). bool RunSetZoom(int tab_id, double zoom_factor); diff --git a/chrome/browser/extensions/api/tabs/tabs_windows_api.h b/chrome/browser/extensions/api/tabs/tabs_windows_api.h index 42c5ff6..72a53a1 100644 --- a/chrome/browser/extensions/api/tabs/tabs_windows_api.h +++ b/chrome/browser/extensions/api/tabs/tabs_windows_api.h @@ -27,14 +27,14 @@ class TabsWindowsAPI : public BrowserContextKeyedAPI, WindowsEventRouter* windows_event_router(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<TabsWindowsAPI>* GetFactoryInstance(); // EventRouter::Observer implementation. virtual void OnListenerAdded(const extensions::EventListenerInfo& details) - OVERRIDE; + override; private: friend class BrowserContextKeyedAPIFactory<TabsWindowsAPI>; diff --git a/chrome/browser/extensions/api/tabs/windows_event_router.h b/chrome/browser/extensions/api/tabs/windows_event_router.h index 7b7fd62..5bb2a1d 100644 --- a/chrome/browser/extensions/api/tabs/windows_event_router.h +++ b/chrome/browser/extensions/api/tabs/windows_event_router.h @@ -39,19 +39,19 @@ class WindowsEventRouter : public WindowControllerListObserver, // WindowControllerListObserver methods: virtual void OnWindowControllerAdded( - WindowController* window_controller) OVERRIDE; + WindowController* window_controller) override; virtual void OnWindowControllerRemoved( - WindowController* window) OVERRIDE; + WindowController* window) override; #if defined(TOOLKIT_VIEWS) virtual void OnNativeFocusChange(gfx::NativeView focused_before, - gfx::NativeView focused_now) OVERRIDE; + gfx::NativeView focused_now) override; #endif // content::NotificationObserver. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // |window_controller| is NULL to indicate a focused window has lost focus. void OnActiveWindowChanged(WindowController* window_controller); diff --git a/chrome/browser/extensions/api/terminal/terminal_private_api.h b/chrome/browser/extensions/api/terminal/terminal_private_api.h index 1764ab8..46915e5 100644 --- a/chrome/browser/extensions/api/terminal/terminal_private_api.h +++ b/chrome/browser/extensions/api/terminal/terminal_private_api.h @@ -20,7 +20,7 @@ class TerminalPrivateFunction : public ChromeAsyncExtensionFunction { virtual ~TerminalPrivateFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Override with actual extension function implementation. virtual bool RunTerminalFunction() = 0; @@ -39,7 +39,7 @@ class TerminalPrivateOpenTerminalProcessFunction virtual ~TerminalPrivateOpenTerminalProcessFunction(); // TerminalPrivateFunction: - virtual bool RunTerminalFunction() OVERRIDE; + virtual bool RunTerminalFunction() override; private: void OpenOnFileThread(); @@ -58,7 +58,7 @@ class TerminalPrivateSendInputFunction : public TerminalPrivateFunction { virtual ~TerminalPrivateSendInputFunction(); // TerminalPrivateFunction: - virtual bool RunTerminalFunction() OVERRIDE; + virtual bool RunTerminalFunction() override; private: void SendInputOnFileThread(pid_t pid, const std::string& input); @@ -75,7 +75,7 @@ class TerminalPrivateCloseTerminalProcessFunction protected: virtual ~TerminalPrivateCloseTerminalProcessFunction(); - virtual bool RunTerminalFunction() OVERRIDE; + virtual bool RunTerminalFunction() override; private: void CloseOnFileThread(pid_t pid); @@ -91,7 +91,7 @@ class TerminalPrivateOnTerminalResizeFunction : public TerminalPrivateFunction { protected: virtual ~TerminalPrivateOnTerminalResizeFunction(); - virtual bool RunTerminalFunction() OVERRIDE; + virtual bool RunTerminalFunction() override; private: void OnResizeOnFileThread(pid_t pid, int width, int height); diff --git a/chrome/browser/extensions/api/terminal/terminal_private_apitest.cc b/chrome/browser/extensions/api/terminal/terminal_private_apitest.cc index fedb7cc..2039685 100644 --- a/chrome/browser/extensions/api/terminal/terminal_private_apitest.cc +++ b/chrome/browser/extensions/api/terminal/terminal_private_apitest.cc @@ -7,7 +7,7 @@ #include "extensions/common/switches.h" class ExtensionTerminalPrivateApiTest : public ExtensionApiTest { - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( extensions::switches::kWhitelistedExtensionID, diff --git a/chrome/browser/extensions/api/top_sites/top_sites_api.h b/chrome/browser/extensions/api/top_sites/top_sites_api.h index 7519fd9..395cc68 100644 --- a/chrome/browser/extensions/api/top_sites/top_sites_api.h +++ b/chrome/browser/extensions/api/top_sites/top_sites_api.h @@ -21,7 +21,7 @@ class TopSitesGetFunction : public ChromeAsyncExtensionFunction { virtual ~TopSitesGetFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnMostVisitedURLsAvailable(const history::MostVisitedURLList& data); diff --git a/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc b/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc index 6fbf2ed..9984623 100644 --- a/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc +++ b/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc @@ -22,7 +22,7 @@ class TopSitesExtensionTest : public InProcessBrowserTest { TopSitesExtensionTest() : top_sites_inited_(false), waiting_(false) { } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { history::TopSites* top_sites = browser()->profile()->GetTopSites(); // This may return async or sync. If sync, top_sites_inited_ will be true diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h index 241387d..8f1d6a7 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h @@ -49,47 +49,47 @@ class WebNavigationTabObserver // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // content::WebContentsObserver implementation. virtual void RenderFrameDeleted( - content::RenderFrameHost* render_frame_host) OVERRIDE; + content::RenderFrameHost* render_frame_host) override; virtual void RenderViewDeleted( - content::RenderViewHost* render_view_host) OVERRIDE; + content::RenderViewHost* render_view_host) override; virtual void AboutToNavigateRenderView( - content::RenderViewHost* render_view_host) OVERRIDE; + content::RenderViewHost* render_view_host) override; virtual void DidStartProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& validated_url, bool is_error_page, - bool is_iframe_srcdoc) OVERRIDE; + bool is_iframe_srcdoc) override; virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - ui::PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) override; virtual void DidFailProvisionalLoad( content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code, - const base::string16& error_description) OVERRIDE; + const base::string16& error_description) override; virtual void DocumentLoadedInFrame( - content::RenderFrameHost* render_frame_host) OVERRIDE; + content::RenderFrameHost* render_frame_host) override; virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host, - const GURL& validated_url) OVERRIDE; + const GURL& validated_url) override; virtual void DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code, - const base::string16& error_description) OVERRIDE; + const base::string16& error_description) override; virtual void DidGetRedirectForResourceRequest( content::RenderViewHost* render_view_host, - const content::ResourceRedirectDetails& details) OVERRIDE; + const content::ResourceRedirectDetails& details) override; virtual void DidOpenRequestedURL(content::WebContents* new_contents, const GURL& url, const content::Referrer& referrer, WindowOpenDisposition disposition, ui::PageTransition transition, - int64 source_frame_num) OVERRIDE; - virtual void WebContentsDestroyed() OVERRIDE; + int64 source_frame_num) override; + virtual void WebContentsDestroyed() override; private: explicit WebNavigationTabObserver(content::WebContents* web_contents); @@ -154,16 +154,16 @@ class WebNavigationEventRouter : public TabStripModelObserver, virtual void TabReplacedAt(TabStripModel* tab_strip_model, content::WebContents* old_contents, content::WebContents* new_contents, - int index) OVERRIDE; + int index) override; // chrome::BrowserListObserver implementation. - virtual void OnBrowserAdded(Browser* browser) OVERRIDE; - virtual void OnBrowserRemoved(Browser* browser) OVERRIDE; + virtual void OnBrowserAdded(Browser* browser) override; + virtual void OnBrowserRemoved(Browser* browser) override; // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Handler for the NOTIFICATION_RETARGETING event. The method takes the // details of such an event and stores them for the later @@ -194,14 +194,14 @@ class WebNavigationEventRouter : public TabStripModelObserver, // API function that returns the state of a given frame. class WebNavigationGetFrameFunction : public ChromeSyncExtensionFunction { virtual ~WebNavigationGetFrameFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("webNavigation.getFrame", WEBNAVIGATION_GETFRAME) }; // API function that returns the states of all frames in a given tab. class WebNavigationGetAllFramesFunction : public ChromeSyncExtensionFunction { virtual ~WebNavigationGetAllFramesFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; DECLARE_EXTENSION_FUNCTION("webNavigation.getAllFrames", WEBNAVIGATION_GETALLFRAMES) }; @@ -213,14 +213,14 @@ class WebNavigationAPI : public BrowserContextKeyedAPI, virtual ~WebNavigationAPI(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static BrowserContextKeyedAPIFactory<WebNavigationAPI>* GetFactoryInstance(); // EventRouter::Observer implementation. virtual void OnListenerAdded(const extensions::EventListenerInfo& details) - OVERRIDE; + override; private: friend class BrowserContextKeyedAPIFactory<WebNavigationAPI>; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc index ef63165..3fa8bd3 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc @@ -119,11 +119,11 @@ class TestNavigationListener } // content::ResourceThrottle implementation. - virtual void WillStartRequest(bool* defer) OVERRIDE { + virtual void WillStartRequest(bool* defer) override { *defer = true; } - virtual const char* GetNameForLogging() const OVERRIDE { + virtual const char* GetNameForLogging() const override { return "TestNavigationListener::Throttle"; } }; @@ -167,7 +167,7 @@ class DelayLoadStartAndExecuteJavascript virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { if (type != chrome::NOTIFICATION_TAB_ADDED) { NOTREACHED(); return; @@ -181,7 +181,7 @@ class DelayLoadStartAndExecuteJavascript content::RenderFrameHost* render_frame_host, const GURL& validated_url, bool is_error_page, - bool is_iframe_srcdoc) OVERRIDE { + bool is_iframe_srcdoc) override { if (validated_url != delay_url_ || !rvh_) return; @@ -192,7 +192,7 @@ class DelayLoadStartAndExecuteJavascript virtual void DidCommitProvisionalLoadForFrame( content::RenderFrameHost* render_frame_host, const GURL& url, - ui::PageTransition transition_type) OVERRIDE { + ui::PageTransition transition_type) override { if (script_was_executed_ && EndsWith(url.spec(), until_url_suffix_, true)) { content::WebContentsObserver::Observe(NULL); test_navigation_listener_->ResumeAll(); @@ -231,7 +231,7 @@ class TestResourceDispatcherHostDelegate content::ResourceContext* resource_context, content::AppCacheService* appcache_service, ResourceType resource_type, - ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE { + ScopedVector<content::ResourceThrottle>* throttles) override { ChromeResourceDispatcherHostDelegate::RequestBeginning( request, resource_context, @@ -258,7 +258,7 @@ class WebNavigationApiTest : public ExtensionApiTest { WebNavigationApiTest() {} virtual ~WebNavigationApiTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); FrameNavigationState::set_allow_extension_scheme(true); @@ -269,7 +269,7 @@ class WebNavigationApiTest : public ExtensionApiTest { host_resolver()->AddRule("*", "127.0.0.1"); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); test_navigation_listener_ = new TestNavigationListener(); resource_dispatcher_host_delegate_.reset( diff --git a/chrome/browser/extensions/api/web_request/chrome_extension_web_request_event_router_delegate.h b/chrome/browser/extensions/api/web_request/chrome_extension_web_request_event_router_delegate.h index e30485a..dfe8053 100644 --- a/chrome/browser/extensions/api/web_request/chrome_extension_web_request_event_router_delegate.h +++ b/chrome/browser/extensions/api/web_request/chrome_extension_web_request_event_router_delegate.h @@ -17,16 +17,16 @@ class ChromeExtensionWebRequestEventRouterDelegate : // WebRequestEventRouterDelegate implementation. virtual void ExtractExtraRequestDetails( - net::URLRequest* request, base::DictionaryValue* out) OVERRIDE; + net::URLRequest* request, base::DictionaryValue* out) override; virtual bool OnGetMatchingListenersImplCheck( - int tab_id, int window_id, net::URLRequest* request) OVERRIDE; + int tab_id, int window_id, net::URLRequest* request) override; virtual void LogExtensionActivity( content::BrowserContext* browser_context, bool is_incognito, const std::string& extension_id, const GURL& url, const std::string& api_call, - scoped_ptr<base::DictionaryValue> details) OVERRIDE; + scoped_ptr<base::DictionaryValue> details) override; }; #endif // CHROME_BROWSER_EXTENSIONS_API_WEB_REQUEST_CHROME_EXTENSION_WEB_REQUEST_EVENT_ROUTER_DELEGATE_H_ diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index 9738b98..88f5c75 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -157,7 +157,7 @@ class TestIPCSender : public IPC::Sender { private: // IPC::Sender - virtual bool Send(IPC::Message* message) OVERRIDE { + virtual bool Send(IPC::Message* message) override { EXPECT_EQ(ExtensionMsg_MessageInvoke::ID, message->type()); EXPECT_FALSE(task_queue_.empty()); @@ -180,7 +180,7 @@ class ExtensionWebRequestTest : public testing::Test { event_router_(new EventRouterForwarder) {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(profile_manager_.SetUp()); ChromeNetworkDelegate::InitializePrefsOnUIThread( &enable_referrers_, NULL, NULL, profile_.GetTestingPrefService()); diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc index 61b3ea4..fdc8697 100644 --- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc @@ -43,7 +43,7 @@ class CancelLoginDialog : public content::NotificationObserver { virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { LoginHandler* handler = content::Details<LoginNotificationDetails>(details).ptr()->handler(); handler->CancelAuth(); @@ -59,7 +59,7 @@ class CancelLoginDialog : public content::NotificationObserver { class ExtensionWebRequestApiTest : public ExtensionApiTest { public: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); host_resolver()->AddRule("*", "127.0.0.1"); } diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc index 98c4f1f..602ceb6 100644 --- a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc @@ -29,7 +29,7 @@ class ExtensionWebRequestHelpersTestWithThreadsTest : public testing::Test { : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {} protected: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; protected: net::TestURLRequestContext context; diff --git a/chrome/browser/extensions/api/web_view/chrome_web_view_internal_api.h b/chrome/browser/extensions/api/web_view/chrome_web_view_internal_api.h index dfda548..70dfad0 100644 --- a/chrome/browser/extensions/api/web_view/chrome_web_view_internal_api.h +++ b/chrome/browser/extensions/api/web_view/chrome_web_view_internal_api.h @@ -26,7 +26,7 @@ class ChromeWebViewInternalContextMenusCreateFunction virtual ~ChromeWebViewInternalContextMenusCreateFunction() {} // ExtensionFunction implementation. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: DISALLOW_COPY_AND_ASSIGN(ChromeWebViewInternalContextMenusCreateFunction); @@ -43,7 +43,7 @@ class ChromeWebViewInternalContextMenusUpdateFunction virtual ~ChromeWebViewInternalContextMenusUpdateFunction() {} // ExtensionFunction implementation. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: DISALLOW_COPY_AND_ASSIGN(ChromeWebViewInternalContextMenusUpdateFunction); @@ -60,7 +60,7 @@ class ChromeWebViewInternalContextMenusRemoveFunction virtual ~ChromeWebViewInternalContextMenusRemoveFunction() {} // ExtensionFunction implementation. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: DISALLOW_COPY_AND_ASSIGN(ChromeWebViewInternalContextMenusRemoveFunction); @@ -77,7 +77,7 @@ class ChromeWebViewInternalContextMenusRemoveAllFunction virtual ~ChromeWebViewInternalContextMenusRemoveAllFunction() {} // ExtensionFunction implementation. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: DISALLOW_COPY_AND_ASSIGN(ChromeWebViewInternalContextMenusRemoveAllFunction); @@ -96,7 +96,7 @@ class ChromeWebViewInternalShowContextMenuFunction private: // WebViewInternalExtensionFunction implementation. - virtual bool RunAsyncSafe(WebViewGuest* guest) OVERRIDE; + virtual bool RunAsyncSafe(WebViewGuest* guest) override; DISALLOW_COPY_AND_ASSIGN(ChromeWebViewInternalShowContextMenuFunction); }; diff --git a/chrome/browser/extensions/api/webcam_private/webcam_private_api.h b/chrome/browser/extensions/api/webcam_private/webcam_private_api.h index 869acc6..b670af2 100644 --- a/chrome/browser/extensions/api/webcam_private/webcam_private_api.h +++ b/chrome/browser/extensions/api/webcam_private/webcam_private_api.h @@ -18,7 +18,7 @@ class WebcamPrivateSetFunction : public SyncExtensionFunction { protected: virtual ~WebcamPrivateSetFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: DISALLOW_COPY_AND_ASSIGN(WebcamPrivateSetFunction); @@ -31,7 +31,7 @@ class WebcamPrivateGetFunction : public SyncExtensionFunction { protected: virtual ~WebcamPrivateGetFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: DISALLOW_COPY_AND_ASSIGN(WebcamPrivateGetFunction); @@ -44,7 +44,7 @@ class WebcamPrivateResetFunction : public SyncExtensionFunction { protected: virtual ~WebcamPrivateResetFunction(); - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: DISALLOW_COPY_AND_ASSIGN(WebcamPrivateResetFunction); diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h index be98154..b73cb51 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h @@ -29,14 +29,14 @@ class WebrtcAudioPrivateEventService virtual ~WebrtcAudioPrivateEventService(); // BrowserContextKeyedAPI implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; static BrowserContextKeyedAPIFactory<WebrtcAudioPrivateEventService>* GetFactoryInstance(); static const char* service_name(); // base::SystemMonitor::DevicesChangedObserver implementation. virtual void OnDevicesChanged( - base::SystemMonitor::DeviceType device_type) OVERRIDE; + base::SystemMonitor::DeviceType device_type) override; private: friend class BrowserContextKeyedAPIFactory<WebrtcAudioPrivateEventService>; @@ -117,10 +117,10 @@ class WebrtcAudioPrivateGetSinksFunction : public WebrtcAudioPrivateFunction { // Sequence of events is that we query the list of sinks on the // AudioManager's thread, then calculate HMACs on the IO thread, // then finish on the UI thread. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void DoQuery(); virtual void OnOutputDeviceNames( - scoped_ptr<media::AudioDeviceNames> raw_ids) OVERRIDE; + scoped_ptr<media::AudioDeviceNames> raw_ids) override; void DoneOnUIThread(); }; @@ -133,11 +133,11 @@ class WebrtcAudioPrivateGetActiveSinkFunction DECLARE_EXTENSION_FUNCTION("webrtcAudioPrivate.getActiveSink", WEBRTC_AUDIO_PRIVATE_GET_ACTIVE_SINK); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; virtual void OnControllerList( const content::RenderViewHost::AudioOutputControllerList& - controllers) OVERRIDE; - virtual void OnHMACCalculated(const std::string& hmac) OVERRIDE; + controllers) override; + virtual void OnHMACCalculated(const std::string& hmac) override; }; class WebrtcAudioPrivateSetActiveSinkFunction @@ -152,12 +152,12 @@ class WebrtcAudioPrivateSetActiveSinkFunction DECLARE_EXTENSION_FUNCTION("webrtcAudioPrivate.setActiveSink", WEBRTC_AUDIO_PRIVATE_SET_ACTIVE_SINK); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; virtual void OnControllerList( const content::RenderViewHost::AudioOutputControllerList& - controllers) OVERRIDE; + controllers) override; virtual void OnOutputDeviceNames( - scoped_ptr<media::AudioDeviceNames> device_names) OVERRIDE; + scoped_ptr<media::AudioDeviceNames> device_names) override; void SwitchDone(); void DoneOnUIThread(); @@ -184,7 +184,7 @@ class WebrtcAudioPrivateGetAssociatedSinkFunction DECLARE_EXTENSION_FUNCTION("webrtcAudioPrivate.getAssociatedSink", WEBRTC_AUDIO_PRIVATE_GET_ASSOCIATED_SINK); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // This implementation is slightly complicated because of different // thread requirements for the various functions we need to invoke. @@ -215,7 +215,7 @@ class WebrtcAudioPrivateGetAssociatedSinkFunction void GetAssociatedSinkOnDeviceThread(const std::string& raw_source_id); // Receives the associated sink ID after its HMAC is calculated. - virtual void OnHMACCalculated(const std::string& hmac) OVERRIDE; + virtual void OnHMACCalculated(const std::string& hmac) override; // Accessed from UI thread and device thread, but only on one at a // time, no locking needed. diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc index 91a2567..a5b537d 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc @@ -77,7 +77,7 @@ class WebrtcAudioPrivateTest : public AudioWaitingExtensionTest { : enumeration_event_(false, false) { } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { AudioWaitingExtensionTest::SetUpOnMainThread(); // Needs to happen after chrome's schemes are added. source_url_ = GURL("chrome-extension://fakeid012345678/fakepage.html"); @@ -371,7 +371,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcAudioPrivateTest, TriggerEvent) { class HangoutServicesBrowserTest : public AudioWaitingExtensionTest { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Make sure the Hangout Services component extension gets loaded. ComponentLoader::EnableBackgroundExtensionsForTesting(); AudioWaitingExtensionTest::SetUp(); diff --git a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.h b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.h index 3f80538..d8e4870 100644 --- a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.h +++ b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.h @@ -36,7 +36,7 @@ class WebrtcLoggingPrivateSetMetaDataFunction virtual ~WebrtcLoggingPrivateSetMetaDataFunction(); // ExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Must be called on UI thread. void SetMetaDataCallback(bool success, const std::string& error_message); @@ -53,7 +53,7 @@ class WebrtcLoggingPrivateStartFunction virtual ~WebrtcLoggingPrivateStartFunction(); // ExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Must be called on UI thread. void StartCallback(bool success, const std::string& error_message); @@ -70,7 +70,7 @@ class WebrtcLoggingPrivateSetUploadOnRenderCloseFunction virtual ~WebrtcLoggingPrivateSetUploadOnRenderCloseFunction(); // ExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class WebrtcLoggingPrivateStopFunction @@ -84,7 +84,7 @@ class WebrtcLoggingPrivateStopFunction virtual ~WebrtcLoggingPrivateStopFunction(); // ExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Must be called on UI thread. void StopCallback(bool success, const std::string& error_message); @@ -101,7 +101,7 @@ class WebrtcLoggingPrivateUploadFunction virtual ~WebrtcLoggingPrivateUploadFunction(); // ExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Must be called on UI thread. void UploadCallback(bool success, const std::string& report_id, @@ -119,7 +119,7 @@ class WebrtcLoggingPrivateDiscardFunction virtual ~WebrtcLoggingPrivateDiscardFunction(); // ExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Must be called on UI thread. void DiscardCallback(bool success, const std::string& error_message); @@ -136,7 +136,7 @@ class WebrtcLoggingPrivateStartRtpDumpFunction virtual ~WebrtcLoggingPrivateStartRtpDumpFunction(); // ExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Must be called on UI thread. void StartRtpDumpCallback(bool success, const std::string& error_message); @@ -153,7 +153,7 @@ class WebrtcLoggingPrivateStopRtpDumpFunction virtual ~WebrtcLoggingPrivateStopRtpDumpFunction(); // ExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Must be called on UI thread. void StopRtpDumpCallback(bool success, const std::string& error_message); diff --git a/chrome/browser/extensions/api/webstore/webstore_api.h b/chrome/browser/extensions/api/webstore/webstore_api.h index 0410445..f5ecc50 100644 --- a/chrome/browser/extensions/api/webstore/webstore_api.h +++ b/chrome/browser/extensions/api/webstore/webstore_api.h @@ -77,14 +77,14 @@ class WebstoreAPI : public BrowserContextKeyedAPI, // InstallObserver implementation. virtual void OnBeginExtensionDownload(const std::string& extension_id) - OVERRIDE; + override; virtual void OnDownloadProgress(const std::string& extension_id, - int percent_downloaded) OVERRIDE; - virtual void OnBeginCrxInstall(const std::string& extension_id) OVERRIDE; - virtual void OnShutdown() OVERRIDE; + int percent_downloaded) override; + virtual void OnBeginCrxInstall(const std::string& extension_id) override; + virtual void OnShutdown() override; // BrowserContextKeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static const char* service_name() { return "WebstoreAPI"; } diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h index 418a496..437ad3d 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h @@ -54,15 +54,15 @@ class WebstorePrivateInstallBundleFunction WebstorePrivateInstallBundleFunction(); // BundleInstaller::Delegate: - virtual void OnBundleInstallApproved() OVERRIDE; - virtual void OnBundleInstallCanceled(bool user_initiated) OVERRIDE; - virtual void OnBundleInstallCompleted() OVERRIDE; + virtual void OnBundleInstallApproved() override; + virtual void OnBundleInstallCanceled(bool user_initiated) override; + virtual void OnBundleInstallCompleted() override; protected: virtual ~WebstorePrivateInstallBundleFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Reads the extension |details| into |items|. bool ReadBundleInfo( @@ -118,21 +118,21 @@ class WebstorePrivateBeginInstallWithManifest3Function virtual void OnWebstoreParseSuccess( const std::string& id, const SkBitmap& icon, - base::DictionaryValue* parsed_manifest) OVERRIDE; + base::DictionaryValue* parsed_manifest) override; virtual void OnWebstoreParseFailure( const std::string& id, InstallHelperResultCode result_code, - const std::string& error_message) OVERRIDE; + const std::string& error_message) override; // ExtensionInstallPrompt::Delegate: - virtual void InstallUIProceed() OVERRIDE; - virtual void InstallUIAbort(bool user_initiated) OVERRIDE; + virtual void InstallUIProceed() override; + virtual void InstallUIAbort(bool user_initiated) override; protected: virtual ~WebstorePrivateBeginInstallWithManifest3Function(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // Sets the result_ as a string based on |code|. void SetResultCode(ResultCode code); @@ -171,17 +171,17 @@ class WebstorePrivateCompleteInstallFunction WebstorePrivateCompleteInstallFunction(); // WebstoreInstaller::Delegate: - virtual void OnExtensionInstallSuccess(const std::string& id) OVERRIDE; + virtual void OnExtensionInstallSuccess(const std::string& id) override; virtual void OnExtensionInstallFailure( const std::string& id, const std::string& error, - WebstoreInstaller::FailureReason reason) OVERRIDE; + WebstoreInstaller::FailureReason reason) override; protected: virtual ~WebstorePrivateCompleteInstallFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: scoped_ptr<WebstoreInstaller::Approval> approval_; @@ -202,7 +202,7 @@ class WebstorePrivateEnableAppLauncherFunction virtual ~WebstorePrivateEnableAppLauncherFunction(); // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class WebstorePrivateGetBrowserLoginFunction @@ -215,7 +215,7 @@ class WebstorePrivateGetBrowserLoginFunction virtual ~WebstorePrivateGetBrowserLoginFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class WebstorePrivateGetStoreLoginFunction @@ -228,7 +228,7 @@ class WebstorePrivateGetStoreLoginFunction virtual ~WebstorePrivateGetStoreLoginFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class WebstorePrivateSetStoreLoginFunction @@ -241,7 +241,7 @@ class WebstorePrivateSetStoreLoginFunction virtual ~WebstorePrivateSetStoreLoginFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class WebstorePrivateGetWebGLStatusFunction @@ -258,7 +258,7 @@ class WebstorePrivateGetWebGLStatusFunction void OnFeatureCheck(bool feature_allowed); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void CreateResult(bool webgl_allowed); @@ -278,7 +278,7 @@ class WebstorePrivateGetIsLauncherEnabledFunction virtual ~WebstorePrivateGetIsLauncherEnabledFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: void OnIsLauncherCheckCompleted(bool is_enabled); @@ -296,7 +296,7 @@ class WebstorePrivateIsInIncognitoModeFunction virtual ~WebstorePrivateIsInIncognitoModeFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class WebstorePrivateLaunchEphemeralAppFunction @@ -311,7 +311,7 @@ class WebstorePrivateLaunchEphemeralAppFunction virtual ~WebstorePrivateLaunchEphemeralAppFunction(); // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnLaunchComplete(webstore_install::Result result, @@ -333,7 +333,7 @@ class WebstorePrivateGetEphemeralAppsEnabledFunction virtual ~WebstorePrivateGetEphemeralAppsEnabledFunction(); // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc index 39de648..7276014 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc @@ -45,7 +45,7 @@ class WebstoreInstallListener : public WebstoreInstaller::Delegate { WebstoreInstallListener() : received_failure_(false), received_success_(false), waiting_(false) {} - virtual void OnExtensionInstallSuccess(const std::string& id) OVERRIDE { + virtual void OnExtensionInstallSuccess(const std::string& id) override { received_success_ = true; id_ = id; @@ -58,7 +58,7 @@ class WebstoreInstallListener : public WebstoreInstaller::Delegate { virtual void OnExtensionInstallFailure( const std::string& id, const std::string& error, - WebstoreInstaller::FailureReason reason) OVERRIDE { + WebstoreInstaller::FailureReason reason) override { received_failure_ = true; id_ = id; error_ = error; @@ -95,14 +95,14 @@ class ExtensionWebstorePrivateApiTest : public ExtensionApiTest { ExtensionWebstorePrivateApiTest() {} virtual ~ExtensionWebstorePrivateApiTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( switches::kAppsGalleryURL, "http://www.example.com/files/extensions/api_test"); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); // Start up the test server and get us ready for calling the install @@ -112,7 +112,7 @@ class ExtensionWebstorePrivateApiTest : public ExtensionApiTest { ExtensionInstallUI::set_disable_failure_ui_for_tests(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); ExtensionInstallPrompt::g_auto_confirm_for_tests = @@ -398,7 +398,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstoreGetWebGLStatusTest, Blocked) { class EphemeralAppWebstorePrivateApiTest : public ExtensionWebstorePrivateApiTest { public: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionWebstorePrivateApiTest::SetUpInProcessBrowserTestFixture(); net::HostPortPair host_port = test_server()->host_port_pair(); @@ -410,7 +410,7 @@ class EphemeralAppWebstorePrivateApiTest switches::kAppsGalleryURL, test_gallery_url); } - virtual GURL GetTestServerURL(const std::string& path) OVERRIDE { + virtual GURL GetTestServerURL(const std::string& path) override { return DoGetTestServerURL( std::string("files/extensions/platform_apps/ephemeral_launcher/") + path); diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc index 0f2b490..3362922 100644 --- a/chrome/browser/extensions/app_background_page_apitest.cc +++ b/chrome/browser/extensions/app_background_page_apitest.cc @@ -42,7 +42,7 @@ using extensions::Extension; class AppBackgroundPageApiTest : public ExtensionApiTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kDisablePopupBlocking); command_line->AppendSwitch(extensions::switches::kAllowHTTPBackgroundPage); @@ -129,7 +129,7 @@ class AppBackgroundPageNaClTest : public AppBackgroundPageApiTest { virtual ~AppBackgroundPageNaClTest() { } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { AppBackgroundPageApiTest::SetUpOnMainThread(); #if !defined(DISABLE_NACL) nacl::NaClProcessHost::SetPpapiKeepAliveThrottleForTesting(50); diff --git a/chrome/browser/extensions/app_icon_loader_impl.h b/chrome/browser/extensions/app_icon_loader_impl.h index c0b68ae..10504cc 100644 --- a/chrome/browser/extensions/app_icon_loader_impl.h +++ b/chrome/browser/extensions/app_icon_loader_impl.h @@ -26,13 +26,13 @@ class AppIconLoaderImpl : public AppIconLoader, virtual ~AppIconLoaderImpl(); // AppIconLoader overrides: - virtual void FetchImage(const std::string& id) OVERRIDE; - virtual void ClearImage(const std::string& id) OVERRIDE; - virtual void UpdateImage(const std::string& id) OVERRIDE; + virtual void FetchImage(const std::string& id) override; + virtual void ClearImage(const std::string& id) override; + virtual void UpdateImage(const std::string& id) override; // extensions::IconImage::Observer overrides: virtual void OnExtensionIconImageChanged( - extensions::IconImage* image) OVERRIDE; + extensions::IconImage* image) override; private: typedef std::map<extensions::IconImage*, std::string> ImageToExtensionIDMap; diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 3567e043..f2bd772 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -57,7 +57,7 @@ class AppApiTest : public ExtensionApiTest { } // Pass flags to make testing apps easier. - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); CommandLine::ForCurrentProcess()->AppendSwitch( switches::kDisablePopupBlocking); @@ -134,7 +134,7 @@ class AppApiTest : public ExtensionApiTest { // Omits the disable-popup-blocking flag so we can cover that case. class BlockedAppApiTest : public AppApiTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); CommandLine::ForCurrentProcess()->AppendSwitch( extensions::switches::kAllowHTTPBackgroundPage); diff --git a/chrome/browser/extensions/app_sync_bundle.h b/chrome/browser/extensions/app_sync_bundle.h index f917d8f..b13f84c 100644 --- a/chrome/browser/extensions/app_sync_bundle.h +++ b/chrome/browser/extensions/app_sync_bundle.h @@ -80,10 +80,10 @@ class AppSyncBundle : public SyncBundle { // Overrides for SyncBundle. // Returns true if SetupSync has been called, false otherwise. - virtual bool IsSyncing() const OVERRIDE; + virtual bool IsSyncing() const override; // Sync a newly-installed application or change an existing one. - virtual void SyncChangeIfNeeded(const Extension& extension) OVERRIDE; + virtual void SyncChangeIfNeeded(const Extension& extension) override; private: // Add a synced app. diff --git a/chrome/browser/extensions/background_app_browsertest.cc b/chrome/browser/extensions/background_app_browsertest.cc index 7951e40..1b4bff2 100644 --- a/chrome/browser/extensions/background_app_browsertest.cc +++ b/chrome/browser/extensions/background_app_browsertest.cc @@ -18,7 +18,7 @@ class TestBackgroundModeManager : public BackgroundModeManager { virtual ~TestBackgroundModeManager() {} virtual void DisplayAppInstalledNotification( - const extensions::Extension* extension) OVERRIDE { + const extensions::Extension* extension) override { showed_background_app_installed_notification_for_test_ = true; } diff --git a/chrome/browser/extensions/blacklist.cc b/chrome/browser/extensions/blacklist.cc index 4d90dee..98e29599 100644 --- a/chrome/browser/extensions/blacklist.cc +++ b/chrome/browser/extensions/blacklist.cc @@ -104,7 +104,7 @@ class SafeBrowsingClientImpl } virtual void OnCheckExtensionsResult( - const std::set<std::string>& hits) OVERRIDE { + const std::set<std::string>& hits) override { DCHECK_CURRENTLY_ON(BrowserThread::IO); callback_message_loop_->PostTask(FROM_HERE, base::Bind(callback_, hits)); Release(); // Balanced in StartCheck. diff --git a/chrome/browser/extensions/blacklist.h b/chrome/browser/extensions/blacklist.h index 2636825..9d8f00e 100644 --- a/chrome/browser/extensions/blacklist.h +++ b/chrome/browser/extensions/blacklist.h @@ -114,7 +114,7 @@ class Blacklist : public content::NotificationObserver, // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; void GetBlacklistStateForIDs(const GetBlacklistedIDsCallback& callback, const std::set<std::string>& blacklisted_ids); diff --git a/chrome/browser/extensions/blacklist_state_fetcher.cc b/chrome/browser/extensions/blacklist_state_fetcher.cc index bbb6523..df14b4a 100644 --- a/chrome/browser/extensions/blacklist_state_fetcher.cc +++ b/chrome/browser/extensions/blacklist_state_fetcher.cc @@ -46,13 +46,13 @@ class BlacklistRequestContextGetter : public net::URLRequestContextGetter { base::Bind(callback, context_getter)); } - virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE { + virtual net::URLRequestContext* GetURLRequestContext() override { DCHECK_CURRENTLY_ON(BrowserThread::IO); return url_request_context_.get(); } virtual scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner() - const OVERRIDE { + const override { return network_task_runner_; } diff --git a/chrome/browser/extensions/blacklist_state_fetcher.h b/chrome/browser/extensions/blacklist_state_fetcher.h index 5e04860..9fb4f8f 100644 --- a/chrome/browser/extensions/blacklist_state_fetcher.h +++ b/chrome/browser/extensions/blacklist_state_fetcher.h @@ -39,7 +39,7 @@ class BlacklistStateFetcher : public net::URLFetcherDelegate { protected: // net::URLFetcherDelegate interface. - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; private: typedef std::multimap<std::string, RequestCallback> CallbackMultiMap; diff --git a/chrome/browser/extensions/blob_reader.h b/chrome/browser/extensions/blob_reader.h index 6e64b5b..dddb416 100644 --- a/chrome/browser/extensions/blob_reader.h +++ b/chrome/browser/extensions/blob_reader.h @@ -40,7 +40,7 @@ class BlobReader : public net::URLFetcherDelegate { private: // Overridden from net::URLFetcherDelegate. - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; BlobReadCallback callback_; scoped_ptr<net::URLFetcher> fetcher_; diff --git a/chrome/browser/extensions/bookmark_app_helper.cc b/chrome/browser/extensions/bookmark_app_helper.cc index 1f35afa..cc1c384 100644 --- a/chrome/browser/extensions/bookmark_app_helper.cc +++ b/chrome/browser/extensions/bookmark_app_helper.cc @@ -52,7 +52,7 @@ class GeneratedIconImageSource : public gfx::CanvasImageSource { private: // gfx::CanvasImageSource overrides: - virtual void Draw(gfx::Canvas* canvas) OVERRIDE { + virtual void Draw(gfx::Canvas* canvas) override { const unsigned char kLuminanceThreshold = 190; const int icon_size = output_size_ * 3 / 4; const int icon_inset = output_size_ / 8; diff --git a/chrome/browser/extensions/bookmark_app_helper.h b/chrome/browser/extensions/bookmark_app_helper.h index c9bd9e9..0e5ad27 100644 --- a/chrome/browser/extensions/bookmark_app_helper.h +++ b/chrome/browser/extensions/bookmark_app_helper.h @@ -73,7 +73,7 @@ class BookmarkAppHelper : public content::NotificationObserver { // Overridden from content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // The WebApplicationInfo that the bookmark app is being created for. WebApplicationInfo web_app_info_; diff --git a/chrome/browser/extensions/bookmark_app_helper_unittest.cc b/chrome/browser/extensions/bookmark_app_helper_unittest.cc index b9e75a7..c042129 100644 --- a/chrome/browser/extensions/bookmark_app_helper_unittest.cc +++ b/chrome/browser/extensions/bookmark_app_helper_unittest.cc @@ -47,14 +47,14 @@ class BookmarkAppHelperExtensionServiceTest BookmarkAppHelperExtensionServiceTest() {} virtual ~BookmarkAppHelperExtensionServiceTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { extensions::ExtensionServiceTestBase::SetUp(); InitializeEmptyExtensionService(); service_->Init(); EXPECT_EQ(0u, service_->extensions()->size()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { ExtensionServiceTestBase::TearDown(); for (content::RenderProcessHost::iterator i( content::RenderProcessHost::AllHostsIterator()); diff --git a/chrome/browser/extensions/browser_extension_window_controller.h b/chrome/browser/extensions/browser_extension_window_controller.h index 2dfb3d4..7899edc 100644 --- a/chrome/browser/extensions/browser_extension_window_controller.h +++ b/chrome/browser/extensions/browser_extension_window_controller.h @@ -19,19 +19,19 @@ class BrowserExtensionWindowController : public extensions::WindowController { virtual ~BrowserExtensionWindowController(); // extensions::WindowController implementation. - virtual int GetWindowId() const OVERRIDE; - virtual std::string GetWindowTypeText() const OVERRIDE; - virtual base::DictionaryValue* CreateWindowValue() const OVERRIDE; + virtual int GetWindowId() const override; + virtual std::string GetWindowTypeText() const override; + virtual base::DictionaryValue* CreateWindowValue() const override; virtual base::DictionaryValue* CreateWindowValueWithTabs( - const extensions::Extension* extension) const OVERRIDE; + const extensions::Extension* extension) const override; virtual base::DictionaryValue* CreateTabValue( - const extensions::Extension* extension, int tab_index) const OVERRIDE; - virtual bool CanClose(Reason* reason) const OVERRIDE; + const extensions::Extension* extension, int tab_index) const override; + virtual bool CanClose(Reason* reason) const override; virtual void SetFullscreenMode(bool is_fullscreen, - const GURL& extension_url) const OVERRIDE; - virtual Browser* GetBrowser() const OVERRIDE; + const GURL& extension_url) const override; + virtual Browser* GetBrowser() const override; virtual bool IsVisibleToExtension( - const extensions::Extension* extension) const OVERRIDE; + const extensions::Extension* extension) const override; private: Browser* browser_; diff --git a/chrome/browser/extensions/browser_permissions_policy_delegate.h b/chrome/browser/extensions/browser_permissions_policy_delegate.h index bdb1f81..f6c72cdc 100644 --- a/chrome/browser/extensions/browser_permissions_policy_delegate.h +++ b/chrome/browser/extensions/browser_permissions_policy_delegate.h @@ -21,7 +21,7 @@ class BrowserPermissionsPolicyDelegate const GURL& top_document_url, int tab_id, int process_id, - std::string* error) OVERRIDE; + std::string* error) override; DISALLOW_COPY_AND_ASSIGN(BrowserPermissionsPolicyDelegate); }; diff --git a/chrome/browser/extensions/bundle_installer.h b/chrome/browser/extensions/bundle_installer.h index f5edfee..a2c7fe76 100644 --- a/chrome/browser/extensions/bundle_installer.h +++ b/chrome/browser/extensions/bundle_installer.h @@ -149,27 +149,27 @@ class BundleInstaller : public WebstoreInstallHelper::Delegate, virtual void OnWebstoreParseSuccess( const std::string& id, const SkBitmap& icon, - base::DictionaryValue* parsed_manifest) OVERRIDE; + base::DictionaryValue* parsed_manifest) override; virtual void OnWebstoreParseFailure( const std::string& id, InstallHelperResultCode result_code, - const std::string& error_message) OVERRIDE; + const std::string& error_message) override; // ExtensionInstallPrompt::Delegate implementation: - virtual void InstallUIProceed() OVERRIDE; - virtual void InstallUIAbort(bool user_initiated) OVERRIDE; + virtual void InstallUIProceed() override; + virtual void InstallUIAbort(bool user_initiated) override; // WebstoreInstaller::Delegate implementation: - virtual void OnExtensionInstallSuccess(const std::string& id) OVERRIDE; + virtual void OnExtensionInstallSuccess(const std::string& id) override; virtual void OnExtensionInstallFailure( const std::string& id, const std::string& error, - WebstoreInstaller::FailureReason reason) OVERRIDE; + WebstoreInstaller::FailureReason reason) override; // chrome::BrowserListObserver implementation: - virtual void OnBrowserAdded(Browser* browser) OVERRIDE; - virtual void OnBrowserRemoved(Browser* browser) OVERRIDE; - virtual void OnBrowserSetLastActive(Browser* browser) OVERRIDE; + virtual void OnBrowserAdded(Browser* browser) override; + virtual void OnBrowserRemoved(Browser* browser) override; + virtual void OnBrowserSetLastActive(Browser* browser) override; // Holds the Extensions used to generate the permission warnings. ExtensionList dummy_extensions_; diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc index 13e37c6..dbfd147 100644 --- a/chrome/browser/extensions/chrome_app_api_browsertest.cc +++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc @@ -87,7 +87,7 @@ class ChromeAppAPITest : public ExtensionBrowserTest { base::Bind(&content::FrameIsChildOfMainFrame)); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII(switches::kAppsCheckoutURL, "http://checkout.com:"); diff --git a/chrome/browser/extensions/chrome_app_sorting.h b/chrome/browser/extensions/chrome_app_sorting.h index 61b1289..b47086c 100644 --- a/chrome/browser/extensions/chrome_app_sorting.h +++ b/chrome/browser/extensions/chrome_app_sorting.h @@ -28,42 +28,42 @@ class ChromeAppSorting : public AppSorting { virtual ~ChromeAppSorting(); // AppSorting implementation: - virtual void SetExtensionScopedPrefs(ExtensionScopedPrefs* prefs) OVERRIDE; + virtual void SetExtensionScopedPrefs(ExtensionScopedPrefs* prefs) override; virtual void SetExtensionSyncService( - ExtensionSyncService* extension_sync_service) OVERRIDE; + ExtensionSyncService* extension_sync_service) override; virtual void Initialize( - const extensions::ExtensionIdList& extension_ids) OVERRIDE; - virtual void FixNTPOrdinalCollisions() OVERRIDE; + const extensions::ExtensionIdList& extension_ids) override; + virtual void FixNTPOrdinalCollisions() override; virtual void EnsureValidOrdinals( const std::string& extension_id, - const syncer::StringOrdinal& suggested_page) OVERRIDE; + const syncer::StringOrdinal& suggested_page) override; virtual void OnExtensionMoved( const std::string& moved_extension_id, const std::string& predecessor_extension_id, - const std::string& successor_extension_id) OVERRIDE; + const std::string& successor_extension_id) override; virtual syncer::StringOrdinal GetAppLaunchOrdinal( - const std::string& extension_id) const OVERRIDE; + const std::string& extension_id) const override; virtual void SetAppLaunchOrdinal( const std::string& extension_id, - const syncer::StringOrdinal& new_app_launch_ordinal) OVERRIDE; + const syncer::StringOrdinal& new_app_launch_ordinal) override; virtual syncer::StringOrdinal CreateFirstAppLaunchOrdinal( - const syncer::StringOrdinal& page_ordinal) const OVERRIDE; + const syncer::StringOrdinal& page_ordinal) const override; virtual syncer::StringOrdinal CreateNextAppLaunchOrdinal( - const syncer::StringOrdinal& page_ordinal) const OVERRIDE; - virtual syncer::StringOrdinal CreateFirstAppPageOrdinal() const OVERRIDE; - virtual syncer::StringOrdinal GetNaturalAppPageOrdinal() const OVERRIDE; + const syncer::StringOrdinal& page_ordinal) const override; + virtual syncer::StringOrdinal CreateFirstAppPageOrdinal() const override; + virtual syncer::StringOrdinal GetNaturalAppPageOrdinal() const override; virtual syncer::StringOrdinal GetPageOrdinal( - const std::string& extension_id) const OVERRIDE; + const std::string& extension_id) const override; virtual void SetPageOrdinal( const std::string& extension_id, - const syncer::StringOrdinal& new_page_ordinal) OVERRIDE; - virtual void ClearOrdinals(const std::string& extension_id) OVERRIDE; + const syncer::StringOrdinal& new_page_ordinal) override; + virtual void ClearOrdinals(const std::string& extension_id) override; virtual int PageStringOrdinalAsInteger( - const syncer::StringOrdinal& page_ordinal) const OVERRIDE; + const syncer::StringOrdinal& page_ordinal) const override; virtual syncer::StringOrdinal PageIntegerAsStringOrdinal( - size_t page_index) OVERRIDE; + size_t page_index) override; virtual void SetExtensionVisible(const std::string& extension_id, - bool visible) OVERRIDE; + bool visible) override; private: // The StringOrdinal is the app launch ordinal and the string is the extension diff --git a/chrome/browser/extensions/chrome_app_sorting_unittest.cc b/chrome/browser/extensions/chrome_app_sorting_unittest.cc index 8d759b4..34e681d 100644 --- a/chrome/browser/extensions/chrome_app_sorting_unittest.cc +++ b/chrome/browser/extensions/chrome_app_sorting_unittest.cc @@ -26,7 +26,7 @@ class ChromeAppSortingTest : public ExtensionPrefsTest { class ChromeAppSortingAppLocation : public ChromeAppSortingTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { extension_ = prefs_.AddExtension("not_an_app"); // Non-apps should not have any app launch ordinal or page ordinal. prefs()->OnExtensionInstalled(extension_.get(), @@ -35,7 +35,7 @@ class ChromeAppSortingAppLocation : public ChromeAppSortingTest { std::string()); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { EXPECT_FALSE( app_sorting()->GetAppLaunchOrdinal(extension_->id()).IsValid()); EXPECT_FALSE( @@ -49,7 +49,7 @@ TEST_F(ChromeAppSortingAppLocation, ChromeAppSortingAppLocation) {} class ChromeAppSortingAppLaunchOrdinal : public ChromeAppSortingTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { // No extensions yet. syncer::StringOrdinal page = syncer::StringOrdinal::CreateInitialOrdinal(); EXPECT_TRUE(syncer::StringOrdinal::CreateInitialOrdinal().Equals( @@ -63,7 +63,7 @@ class ChromeAppSortingAppLaunchOrdinal : public ChromeAppSortingTest { std::string()); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { syncer::StringOrdinal launch_ordinal = app_sorting()->GetAppLaunchOrdinal(extension_->id()); syncer::StringOrdinal page_ordinal = @@ -105,7 +105,7 @@ TEST_F(ChromeAppSortingAppLaunchOrdinal, ChromeAppSortingAppLaunchOrdinal) {} class ChromeAppSortingPageOrdinal : public ChromeAppSortingTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { extension_ = prefs_.AddApp("page_ordinal"); // Install with a page preference. first_page_ = syncer::StringOrdinal::CreateInitialOrdinal(); @@ -126,7 +126,7 @@ class ChromeAppSortingPageOrdinal : public ChromeAppSortingTest { EXPECT_TRUE(first_page_.Equals( app_sorting()->GetPageOrdinal(extension2->id()))); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { // Set the page ordinal. syncer::StringOrdinal new_page = first_page_.CreateAfter(); app_sorting()->SetPageOrdinal(extension_->id(), new_page); @@ -153,7 +153,7 @@ class ChromeAppSortingInitialize : public PrefsPrepopulatedTestBase { ChromeAppSortingInitialize() {} virtual ~ChromeAppSortingInitialize() {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { // A preference determining the order of which the apps appear on the NTP. const char kPrefAppLaunchIndexDeprecated[] = "app_launcher_index"; // A preference determining the page on which an app appears in the NTP. @@ -192,7 +192,7 @@ class ChromeAppSortingInitialize : public PrefsPrepopulatedTestBase { prefs()->app_sorting()->Initialize(ids); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { syncer::StringOrdinal first_ordinal = syncer::StringOrdinal::CreateInitialOrdinal(); AppSorting* app_sorting = prefs()->app_sorting(); @@ -221,7 +221,7 @@ class ChromeAppSortingInitializeWithNoApps : public PrefsPrepopulatedTestBase { ChromeAppSortingInitializeWithNoApps() {} virtual ~ChromeAppSortingInitializeWithNoApps() {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { AppSorting* app_sorting = prefs()->app_sorting(); // Make sure that the web store has valid ordinals. @@ -235,7 +235,7 @@ class ChromeAppSortingInitializeWithNoApps : public PrefsPrepopulatedTestBase { ExtensionIdList ids; app_sorting->Initialize(ids); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { ChromeAppSorting* app_sorting = static_cast<ChromeAppSorting*>(prefs()->app_sorting()); @@ -269,7 +269,7 @@ class ChromeAppSortingMigrateAppIndexInvalid ChromeAppSortingMigrateAppIndexInvalid() {} virtual ~ChromeAppSortingMigrateAppIndexInvalid() {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { // A preference determining the order of which the apps appear on the NTP. const char kPrefAppLaunchIndexDeprecated[] = "app_launcher_index"; // A preference determining the page on which an app appears in the NTP. @@ -290,7 +290,7 @@ class ChromeAppSortingMigrateAppIndexInvalid prefs()->app_sorting()->Initialize(ids); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { // Make sure that the invalid page_index wasn't converted over. EXPECT_FALSE(prefs()->app_sorting()->GetAppLaunchOrdinal( extension1()->id()).IsValid()); @@ -305,7 +305,7 @@ class ChromeAppSortingFixNTPCollisionsAllCollide ChromeAppSortingFixNTPCollisionsAllCollide() {} virtual ~ChromeAppSortingFixNTPCollisionsAllCollide() {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { repeated_ordinal_ = syncer::StringOrdinal::CreateInitialOrdinal(); AppSorting* app_sorting = prefs()->app_sorting(); @@ -322,7 +322,7 @@ class ChromeAppSortingFixNTPCollisionsAllCollide app_sorting->FixNTPOrdinalCollisions(); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { AppSorting* app_sorting = prefs()->app_sorting(); syncer::StringOrdinal extension1_app_launch = app_sorting->GetAppLaunchOrdinal(extension1()->id()); @@ -361,7 +361,7 @@ class ChromeAppSortingFixNTPCollisionsSomeCollideAtStart ChromeAppSortingFixNTPCollisionsSomeCollideAtStart() {} virtual ~ChromeAppSortingFixNTPCollisionsSomeCollideAtStart() {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { first_ordinal_ = syncer::StringOrdinal::CreateInitialOrdinal(); syncer::StringOrdinal second_ordinal = first_ordinal_.CreateAfter(); @@ -381,7 +381,7 @@ class ChromeAppSortingFixNTPCollisionsSomeCollideAtStart app_sorting->FixNTPOrdinalCollisions(); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { AppSorting* app_sorting = prefs()->app_sorting(); syncer::StringOrdinal extension1_app_launch = app_sorting->GetAppLaunchOrdinal(extension1()->id()); @@ -419,7 +419,7 @@ class ChromeAppSortingFixNTPCollisionsSomeCollideAtEnd ChromeAppSortingFixNTPCollisionsSomeCollideAtEnd() {} virtual ~ChromeAppSortingFixNTPCollisionsSomeCollideAtEnd() {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { first_ordinal_ = syncer::StringOrdinal::CreateInitialOrdinal(); syncer::StringOrdinal second_ordinal = first_ordinal_.CreateAfter(); @@ -439,7 +439,7 @@ class ChromeAppSortingFixNTPCollisionsSomeCollideAtEnd app_sorting->FixNTPOrdinalCollisions(); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { AppSorting* app_sorting = prefs()->app_sorting(); syncer::StringOrdinal extension1_app_launch = app_sorting->GetAppLaunchOrdinal(extension1()->id()); @@ -477,7 +477,7 @@ class ChromeAppSortingFixNTPCollisionsTwoCollisions ChromeAppSortingFixNTPCollisionsTwoCollisions() {} virtual ~ChromeAppSortingFixNTPCollisionsTwoCollisions() {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { first_ordinal_ = syncer::StringOrdinal::CreateInitialOrdinal(); syncer::StringOrdinal second_ordinal = first_ordinal_.CreateAfter(); @@ -498,7 +498,7 @@ class ChromeAppSortingFixNTPCollisionsTwoCollisions app_sorting->FixNTPOrdinalCollisions(); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { AppSorting* app_sorting = prefs()->app_sorting(); syncer::StringOrdinal extension1_app_launch = app_sorting->GetAppLaunchOrdinal(extension1()->id()); @@ -545,8 +545,8 @@ class ChromeAppSortingEnsureValidOrdinals ChromeAppSortingEnsureValidOrdinals() {} virtual ~ChromeAppSortingEnsureValidOrdinals() {} - virtual void Initialize() OVERRIDE {} - virtual void Verify() OVERRIDE { + virtual void Initialize() override {} + virtual void Verify() override { AppSorting* app_sorting = prefs()->app_sorting(); // Give ext1 invalid ordinals and then check that EnsureValidOrdinals fixes @@ -570,8 +570,8 @@ class ChromeAppSortingPageOrdinalMapping : public PrefsPrepopulatedTestBase { ChromeAppSortingPageOrdinalMapping() {} virtual ~ChromeAppSortingPageOrdinalMapping() {} - virtual void Initialize() OVERRIDE {} - virtual void Verify() OVERRIDE { + virtual void Initialize() override {} + virtual void Verify() override { std::string ext_1 = "ext_1"; std::string ext_2 = "ext_2"; @@ -668,8 +668,8 @@ class ChromeAppSortingGetMinOrMaxAppLaunchOrdinalsOnPage ChromeAppSortingGetMinOrMaxAppLaunchOrdinalsOnPage() {} virtual ~ChromeAppSortingGetMinOrMaxAppLaunchOrdinalsOnPage() {} - virtual void Initialize() OVERRIDE {} - virtual void Verify() OVERRIDE { + virtual void Initialize() override {} + virtual void Verify() override { syncer::StringOrdinal page = syncer::StringOrdinal::CreateInitialOrdinal(); ChromeAppSorting* app_sorting = static_cast<ChromeAppSorting*>(prefs()->app_sorting()); @@ -713,7 +713,7 @@ class ChromeAppSortingKeepEmptyStringOrdinalPages ChromeAppSortingKeepEmptyStringOrdinalPages() {} virtual ~ChromeAppSortingKeepEmptyStringOrdinalPages() {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { AppSorting* app_sorting = prefs()->app_sorting(); syncer::StringOrdinal first_page = @@ -729,7 +729,7 @@ class ChromeAppSortingKeepEmptyStringOrdinalPages app_sorting->SetPageOrdinal(app2_->id(), first_page); EXPECT_EQ(0, app_sorting->PageStringOrdinalAsInteger(first_page)); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { AppSorting* app_sorting = prefs()->app_sorting(); // Move the second app to a new empty page at the end, skipping over @@ -752,7 +752,7 @@ class ChromeAppSortingMakesFillerOrdinals ChromeAppSortingMakesFillerOrdinals() {} virtual ~ChromeAppSortingMakesFillerOrdinals() {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { AppSorting* app_sorting = prefs()->app_sorting(); syncer::StringOrdinal first_page = @@ -760,7 +760,7 @@ class ChromeAppSortingMakesFillerOrdinals app_sorting->SetPageOrdinal(app1_->id(), first_page); EXPECT_EQ(0, app_sorting->PageStringOrdinalAsInteger(first_page)); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { AppSorting* app_sorting = prefs()->app_sorting(); // Because the UI can add an unlimited number of empty pages without an app @@ -785,7 +785,7 @@ class ChromeAppSortingDefaultOrdinalsBase : public ChromeAppSortingTest { ChromeAppSortingDefaultOrdinalsBase() {} virtual ~ChromeAppSortingDefaultOrdinalsBase() {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { app_ = CreateApp("app"); InitDefaultOrdinals(); @@ -846,7 +846,7 @@ class ChromeAppSortingDefaultOrdinals ChromeAppSortingDefaultOrdinals() {} virtual ~ChromeAppSortingDefaultOrdinals() {} - virtual void Verify() OVERRIDE { + virtual void Verify() override { AppSorting* app_sorting = prefs()->app_sorting(); EXPECT_TRUE(app_sorting->GetPageOrdinal(app_->id()).Equals( default_page_ordinal_)); @@ -864,7 +864,7 @@ class ChromeAppSortingDefaultOrdinalOverriddenByInstallPage ChromeAppSortingDefaultOrdinalOverriddenByInstallPage() {} virtual ~ChromeAppSortingDefaultOrdinalOverriddenByInstallPage() {} - virtual void Verify() OVERRIDE { + virtual void Verify() override { AppSorting* app_sorting = prefs()->app_sorting(); EXPECT_FALSE(app_sorting->GetPageOrdinal(app_->id()).Equals( @@ -873,7 +873,7 @@ class ChromeAppSortingDefaultOrdinalOverriddenByInstallPage } protected: - virtual void InstallApps() OVERRIDE { + virtual void InstallApps() override { install_page_ = default_page_ordinal_.CreateAfter(); prefs()->OnExtensionInstalled(app_.get(), Extension::ENABLED, @@ -894,7 +894,7 @@ class ChromeAppSortingDefaultOrdinalOverriddenByUserValue ChromeAppSortingDefaultOrdinalOverriddenByUserValue() {} virtual ~ChromeAppSortingDefaultOrdinalOverriddenByUserValue() {} - virtual void Verify() OVERRIDE { + virtual void Verify() override { AppSorting* app_sorting = prefs()->app_sorting(); EXPECT_TRUE(app_sorting->GetPageOrdinal(app_->id()).Equals( @@ -904,7 +904,7 @@ class ChromeAppSortingDefaultOrdinalOverriddenByUserValue } protected: - virtual void SetupUserOrdinals() OVERRIDE { + virtual void SetupUserOrdinals() override { user_page_ordinal_ = default_page_ordinal_.CreateAfter(); user_app_launch_ordinal_ = default_app_launch_ordinal_.CreateBefore(); @@ -927,7 +927,7 @@ class ChromeAppSortingDefaultOrdinalNoCollision ChromeAppSortingDefaultOrdinalNoCollision() {} virtual ~ChromeAppSortingDefaultOrdinalNoCollision() {} - virtual void Verify() OVERRIDE { + virtual void Verify() override { AppSorting* app_sorting = prefs()->app_sorting(); // Use the default page. @@ -939,7 +939,7 @@ class ChromeAppSortingDefaultOrdinalNoCollision } protected: - virtual void SetupUserOrdinals() OVERRIDE { + virtual void SetupUserOrdinals() override { other_app_ = prefs_.AddApp("other_app"); // Creates a collision. AppSorting* app_sorting = prefs()->app_sorting(); @@ -966,12 +966,12 @@ class ChromeAppSortingSetExtensionVisible : public ChromeAppSortingTest { ChromeAppSortingSetExtensionVisible() {} virtual ~ChromeAppSortingSetExtensionVisible() {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { first_app_ = prefs_.AddApp("first_app"); second_app_ = prefs_.AddApp("second_app"); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { ChromeAppSorting* sorting = app_sorting(); syncer::StringOrdinal page1 = sorting->GetPageOrdinal(first_app_->id()); syncer::StringOrdinal page2 = sorting->GetPageOrdinal(second_app_->id()); diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.h b/chrome/browser/extensions/chrome_component_extension_resource_manager.h index 6c6448f..1ddd6e4 100644 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager.h +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.h @@ -25,7 +25,7 @@ class ChromeComponentExtensionResourceManager virtual bool IsComponentExtensionResource( const base::FilePath& extension_path, const base::FilePath& resource_path, - int* resource_id) OVERRIDE; + int* resource_id) override; private: void AddComponentResourceEntries(const GritResourceMap* entries, size_t size); diff --git a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h index 80eb5b8..eecb554 100644 --- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h +++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h @@ -57,28 +57,28 @@ class ChromeContentBrowserClientExtensionsPart private: // ChromeContentBrowserClientParts: virtual void RenderProcessWillLaunch( - content::RenderProcessHost* host) OVERRIDE; + content::RenderProcessHost* host) override; virtual void SiteInstanceGotProcess( - content::SiteInstance* site_instance) OVERRIDE; + content::SiteInstance* site_instance) override; virtual void SiteInstanceDeleting( - content::SiteInstance* site_instance) OVERRIDE; + content::SiteInstance* site_instance) override; virtual void OverrideWebkitPrefs(content::RenderViewHost* rvh, const GURL& url, - content::WebPreferences* web_prefs) OVERRIDE; + content::WebPreferences* web_prefs) override; virtual void BrowserURLHandlerCreated( - content::BrowserURLHandler* handler) OVERRIDE; + content::BrowserURLHandler* handler) override; virtual void GetAdditionalAllowedSchemesForFileSystem( - std::vector<std::string>* additional_allowed_schemes) OVERRIDE; + std::vector<std::string>* additional_allowed_schemes) override; virtual void GetURLRequestAutoMountHandlers( - std::vector<storage::URLRequestAutoMountHandler>* handlers) OVERRIDE; + std::vector<storage::URLRequestAutoMountHandler>* handlers) override; virtual void GetAdditionalFileSystemBackends( content::BrowserContext* browser_context, const base::FilePath& storage_partition_path, - ScopedVector<storage::FileSystemBackend>* additional_backends) OVERRIDE; + ScopedVector<storage::FileSystemBackend>* additional_backends) override; virtual void AppendExtraRendererCommandLineSwitches( base::CommandLine* command_line, content::RenderProcessHost* process, - Profile* profile) OVERRIDE; + Profile* profile) override; scoped_ptr<BrowserPermissionsPolicyDelegate> permissions_policy_delegate_; diff --git a/chrome/browser/extensions/chrome_extension_function.h b/chrome/browser/extensions/chrome_extension_function.h index 98002b4..013ff12 100644 --- a/chrome/browser/extensions/chrome_extension_function.h +++ b/chrome/browser/extensions/chrome_extension_function.h @@ -60,7 +60,7 @@ class ChromeUIThreadExtensionFunction : public UIThreadExtensionFunction { // Gets the "current" web contents if any. If there is no associated web // contents then defaults to the foremost one. - virtual content::WebContents* GetAssociatedWebContents() OVERRIDE; + virtual content::WebContents* GetAssociatedWebContents() override; protected: virtual ~ChromeUIThreadExtensionFunction(); @@ -87,7 +87,7 @@ class ChromeAsyncExtensionFunction : public ChromeUIThreadExtensionFunction { static bool ValidationFailure(ChromeAsyncExtensionFunction* function); private: - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; }; // A chrome specific analog to SyncExtensionFunction. This has access to a @@ -111,7 +111,7 @@ class ChromeSyncExtensionFunction : public ChromeUIThreadExtensionFunction { static bool ValidationFailure(ChromeSyncExtensionFunction* function); private: - virtual ResponseAction Run() OVERRIDE; + virtual ResponseAction Run() override; }; #endif // CHROME_BROWSER_EXTENSIONS_CHROME_EXTENSION_FUNCTION_H_ diff --git a/chrome/browser/extensions/chrome_extension_host_delegate.h b/chrome/browser/extensions/chrome_extension_host_delegate.h index da8bcb2..06e59b6 100644 --- a/chrome/browser/extensions/chrome_extension_host_delegate.h +++ b/chrome/browser/extensions/chrome_extension_host_delegate.h @@ -17,25 +17,25 @@ class ChromeExtensionHostDelegate : public ExtensionHostDelegate { // ExtensionHostDelegate implementation. virtual void OnExtensionHostCreated(content::WebContents* web_contents) - OVERRIDE; + override; virtual void OnRenderViewCreatedForBackgroundPage(ExtensionHost* host) - OVERRIDE; + override; virtual content::JavaScriptDialogManager* GetJavaScriptDialogManager() - OVERRIDE; + override; virtual void CreateTab(content::WebContents* web_contents, const std::string& extension_id, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, - bool user_gesture) OVERRIDE; + bool user_gesture) override; virtual void ProcessMediaAccessRequest( content::WebContents* web_contents, const content::MediaStreamRequest& request, const content::MediaResponseCallback& callback, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual bool CheckMediaAccessPermission(content::WebContents* web_contents, const GURL& security_origin, content::MediaStreamType type, - const Extension* extension) OVERRIDE; + const Extension* extension) override; }; } // namespace extensions diff --git a/chrome/browser/extensions/chrome_extension_web_contents_observer.h b/chrome/browser/extensions/chrome_extension_web_contents_observer.h index d63cb20..b11ba24 100644 --- a/chrome/browser/extensions/chrome_extension_web_contents_observer.h +++ b/chrome/browser/extensions/chrome_extension_web_contents_observer.h @@ -32,10 +32,10 @@ class ChromeExtensionWebContentsObserver // content::WebContentsObserver overrides. virtual void RenderViewCreated(content::RenderViewHost* render_view_host) - OVERRIDE; + override; virtual bool OnMessageReceived( const IPC::Message& message, - content::RenderFrameHost* render_frame_host) OVERRIDE; + content::RenderFrameHost* render_frame_host) override; // Adds a message to the extensions ErrorConsole. void OnDetailedConsoleMessageAdded(const base::string16& message, diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.h b/chrome/browser/extensions/chrome_extensions_browser_client.h index b1eb256..c9153f1 100644 --- a/chrome/browser/extensions/chrome_extensions_browser_client.h +++ b/chrome/browser/extensions/chrome_extensions_browser_client.h @@ -41,61 +41,61 @@ class ChromeExtensionsBrowserClient : public ExtensionsBrowserClient { virtual ~ChromeExtensionsBrowserClient(); // BrowserClient overrides: - virtual bool IsShuttingDown() OVERRIDE; + virtual bool IsShuttingDown() override; virtual bool AreExtensionsDisabled(const base::CommandLine& command_line, - content::BrowserContext* context) OVERRIDE; - virtual bool IsValidContext(content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; + virtual bool IsValidContext(content::BrowserContext* context) override; virtual bool IsSameContext(content::BrowserContext* first, - content::BrowserContext* second) OVERRIDE; + content::BrowserContext* second) override; virtual bool HasOffTheRecordContext( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; virtual content::BrowserContext* GetOffTheRecordContext( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; virtual content::BrowserContext* GetOriginalContext( - content::BrowserContext* context) OVERRIDE; - virtual bool IsGuestSession(content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) override; + virtual bool IsGuestSession(content::BrowserContext* context) const override; virtual bool IsExtensionIncognitoEnabled( const std::string& extension_id, - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual bool CanExtensionCrossIncognito( const extensions::Extension* extension, - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual net::URLRequestJob* MaybeCreateResourceBundleRequestJob( net::URLRequest* request, net::NetworkDelegate* network_delegate, const base::FilePath& directory_path, const std::string& content_security_policy, - bool send_cors_header) OVERRIDE; + bool send_cors_header) override; virtual bool AllowCrossRendererResourceLoad(net::URLRequest* request, bool is_incognito, const Extension* extension, InfoMap* extension_info_map) - OVERRIDE; + override; virtual PrefService* GetPrefServiceForContext( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; virtual void GetEarlyExtensionPrefsObservers( content::BrowserContext* context, - std::vector<ExtensionPrefsObserver*>* observers) const OVERRIDE; - virtual ProcessManagerDelegate* GetProcessManagerDelegate() const OVERRIDE; + std::vector<ExtensionPrefsObserver*>* observers) const override; + virtual ProcessManagerDelegate* GetProcessManagerDelegate() const override; virtual scoped_ptr<ExtensionHostDelegate> CreateExtensionHostDelegate() - OVERRIDE; - virtual bool DidVersionUpdate(content::BrowserContext* context) OVERRIDE; - virtual void PermitExternalProtocolHandler() OVERRIDE; - virtual scoped_ptr<AppSorting> CreateAppSorting() OVERRIDE; - virtual bool IsRunningInForcedAppMode() OVERRIDE; + override; + virtual bool DidVersionUpdate(content::BrowserContext* context) override; + virtual void PermitExternalProtocolHandler() override; + virtual scoped_ptr<AppSorting> CreateAppSorting() override; + virtual bool IsRunningInForcedAppMode() override; virtual ApiActivityMonitor* GetApiActivityMonitor( - content::BrowserContext* context) OVERRIDE; - virtual ExtensionSystemProvider* GetExtensionSystemFactory() OVERRIDE; + content::BrowserContext* context) override; + virtual ExtensionSystemProvider* GetExtensionSystemFactory() override; virtual void RegisterExtensionFunctions( - ExtensionFunctionRegistry* registry) const OVERRIDE; + ExtensionFunctionRegistry* registry) const override; virtual scoped_ptr<extensions::RuntimeAPIDelegate> CreateRuntimeAPIDelegate( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual ComponentExtensionResourceManager* - GetComponentExtensionResourceManager() OVERRIDE; + GetComponentExtensionResourceManager() override; virtual void BroadcastEventToRenderers( const std::string& event_name, - scoped_ptr<base::ListValue> args) OVERRIDE; - virtual net::NetLog* GetNetLog() OVERRIDE; + scoped_ptr<base::ListValue> args) override; + virtual net::NetLog* GetNetLog() override; private: friend struct base::DefaultLazyInstanceTraits<ChromeExtensionsBrowserClient>; diff --git a/chrome/browser/extensions/chrome_notification_observer.h b/chrome/browser/extensions/chrome_notification_observer.h index 8045b15..fd57766 100644 --- a/chrome/browser/extensions/chrome_notification_observer.h +++ b/chrome/browser/extensions/chrome_notification_observer.h @@ -31,7 +31,7 @@ class ChromeNotificationObserver : public content::NotificationObserver { // content::NotificationObserver overrides: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: content::NotificationRegistrar registrar_; diff --git a/chrome/browser/extensions/chrome_process_manager_delegate.h b/chrome/browser/extensions/chrome_process_manager_delegate.h index e2f0fbe..ea87b4a 100644 --- a/chrome/browser/extensions/chrome_process_manager_delegate.h +++ b/chrome/browser/extensions/chrome_process_manager_delegate.h @@ -26,14 +26,14 @@ class ChromeProcessManagerDelegate : public ProcessManagerDelegate, // ProcessManagerDelegate implementation: virtual bool IsBackgroundPageAllowed( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual bool DeferCreatingStartupBackgroundHosts( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; // content::NotificationObserver implementation: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: // Notification handlers. diff --git a/chrome/browser/extensions/chrome_url_request_util.cc b/chrome/browser/extensions/chrome_url_request_util.cc index 03822b0..baea8fa 100644 --- a/chrome/browser/extensions/chrome_url_request_util.cc +++ b/chrome/browser/extensions/chrome_url_request_util.cc @@ -61,7 +61,7 @@ class URLRequestResourceBundleJob : public net::URLRequestSimpleJob { virtual int GetData(std::string* mime_type, std::string* charset, std::string* data, - const net::CompletionCallback& callback) const OVERRIDE { + const net::CompletionCallback& callback) const override { const ResourceBundle& rb = ResourceBundle::GetSharedInstance(); *data = rb.GetRawDataResource(resource_id_).as_string(); @@ -90,7 +90,7 @@ class URLRequestResourceBundleJob : public net::URLRequestSimpleJob { return net::ERR_IO_PENDING; } - virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE { + virtual void GetResponseInfo(net::HttpResponseInfo* info) override { *info = response_info_; } diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc index 742fa2c..dbe01a1 100644 --- a/chrome/browser/extensions/component_loader_unittest.cc +++ b/chrome/browser/extensions/component_loader_unittest.cc @@ -36,7 +36,7 @@ class MockExtensionService : public TestExtensionService { MockExtensionService() : ready_(false), unloaded_count_(0) { } - virtual void AddComponentExtension(const Extension* extension) OVERRIDE { + virtual void AddComponentExtension(const Extension* extension) override { EXPECT_FALSE(extension_set_.Contains(extension->id())); // ExtensionService must become the owner of the extension object. extension_set_.Insert(extension); @@ -44,7 +44,7 @@ class MockExtensionService : public TestExtensionService { virtual void UnloadExtension( const std::string& extension_id, - UnloadedExtensionInfo::Reason reason) OVERRIDE { + UnloadedExtensionInfo::Reason reason) override { ASSERT_TRUE(extension_set_.Contains(extension_id)); // Remove the extension with the matching id. extension_set_.Remove(extension_id); @@ -52,15 +52,15 @@ class MockExtensionService : public TestExtensionService { } virtual void RemoveComponentExtension(const std::string & extension_id) - OVERRIDE { + override { UnloadExtension(extension_id, UnloadedExtensionInfo::REASON_DISABLE); } - virtual bool is_ready() OVERRIDE { + virtual bool is_ready() override { return ready_; } - virtual const ExtensionSet* extensions() const OVERRIDE { + virtual const ExtensionSet* extensions() const override { return &extension_set_; } @@ -90,7 +90,7 @@ class ComponentLoaderTest : public testing::Test { &profile_) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { extension_path_ = GetBasePath().AppendASCII("good") .AppendASCII("Extensions") diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc index 58e4cbf..40cfc8b 100644 --- a/chrome/browser/extensions/content_script_apitest.cc +++ b/chrome/browser/extensions/content_script_apitest.cc @@ -162,7 +162,7 @@ class ContentScriptCssInjectionTest : public ExtensionApiTest { protected: // TODO(rdevlin.cronin): Make a testing switch that looks like FeatureSwitch, // but takes in an optional value so that we don't have to do this. - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(base::CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); // We change the Webstore URL to be http://cws.com. We need to do this so // we can check that css injection is not allowed on the webstore (which diff --git a/chrome/browser/extensions/content_verifier_browsertest.cc b/chrome/browser/extensions/content_verifier_browsertest.cc index 4cd57f3..c6ebcd9 100644 --- a/chrome/browser/extensions/content_verifier_browsertest.cc +++ b/chrome/browser/extensions/content_verifier_browsertest.cc @@ -36,7 +36,7 @@ class UnloadObserver : public ExtensionRegistryObserver { virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE { + UnloadedExtensionInfo::Reason reason) override { observed_.insert(extension->id()); if (awaited_id_ == extension->id()) loop_runner_->Quit(); @@ -62,7 +62,7 @@ class JobDelegate : public ContentVerifyJob::TestDelegate { virtual ContentVerifyJob::FailureReason BytesRead(const ExtensionId& id, int count, - const char* data) OVERRIDE { + const char* data) override { if (id == id_ && fail_next_read_) { fail_next_read_ = false; return ContentVerifyJob::HASH_MISMATCH; @@ -71,7 +71,7 @@ class JobDelegate : public ContentVerifyJob::TestDelegate { } virtual ContentVerifyJob::FailureReason DoneReading( - const ExtensionId& id) OVERRIDE { + const ExtensionId& id) override { if (id == id_ && fail_next_done_) { fail_next_done_ = false; return ContentVerifyJob::HASH_MISMATCH; @@ -94,7 +94,7 @@ class ContentVerifierTest : public ExtensionBrowserTest { ContentVerifierTest() {} virtual ~ContentVerifierTest() {} - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(base::CommandLine* command_line) override { ExtensionBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( switches::kExtensionContentVerification, @@ -102,7 +102,7 @@ class ContentVerifierTest : public ExtensionBrowserTest { } // Setup our unload observer and JobDelegate, and install a test extension. - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionBrowserTest::SetUpOnMainThread(); unload_observer_.reset( new UnloadObserver(ExtensionRegistry::Get(profile()))); @@ -115,7 +115,7 @@ class ContentVerifierTest : public ExtensionBrowserTest { ContentVerifyJob::SetDelegateForTests(&delegate_); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { ContentVerifyJob::SetDelegateForTests(NULL); ExtensionBrowserTest::TearDownOnMainThread(); } diff --git a/chrome/browser/extensions/convert_web_app_browsertest.cc b/chrome/browser/extensions/convert_web_app_browsertest.cc index 1c3cc72..438c414 100644 --- a/chrome/browser/extensions/convert_web_app_browsertest.cc +++ b/chrome/browser/extensions/convert_web_app_browsertest.cc @@ -43,7 +43,7 @@ class ExtensionFromWebAppTest // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { if (type == extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED) { const Extension* extension = diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h index 81a3b68..303889b 100644 --- a/chrome/browser/extensions/crx_installer.h +++ b/chrome/browser/extensions/crx_installer.h @@ -108,8 +108,8 @@ class CrxInstaller void InstallWebApp(const WebApplicationInfo& web_app); // Overridden from ExtensionInstallPrompt::Delegate: - virtual void InstallUIProceed() OVERRIDE; - virtual void InstallUIAbort(bool user_initiated) OVERRIDE; + virtual void InstallUIProceed() override; + virtual void InstallUIAbort(bool user_initiated) override; int creation_flags() const { return creation_flags_; } void set_creation_flags(int val) { creation_flags_ = val; } @@ -222,12 +222,12 @@ class CrxInstaller CrxInstallerError AllowInstall(const Extension* extension); // SandboxedUnpackerClient - virtual void OnUnpackFailure(const base::string16& error_message) OVERRIDE; + virtual void OnUnpackFailure(const base::string16& error_message) override; virtual void OnUnpackSuccess(const base::FilePath& temp_dir, const base::FilePath& extension_dir, const base::DictionaryValue* original_manifest, const Extension* extension, - const SkBitmap& install_icon) OVERRIDE; + const SkBitmap& install_icon) override; // Called on the UI thread to start the requirements, policy and blacklist // checks on the extension. diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc index b251719..5caf207 100644 --- a/chrome/browser/extensions/crx_installer_browsertest.cc +++ b/chrome/browser/extensions/crx_installer_browsertest.cc @@ -105,16 +105,16 @@ class MockInstallPrompt : public ExtensionInstallPrompt { virtual void ConfirmInstall( Delegate* delegate, const Extension* extension, - const ShowDialogCallback& show_dialog_callback) OVERRIDE { + const ShowDialogCallback& show_dialog_callback) override { proxy_->set_confirmation_requested(); delegate->InstallUIProceed(); } virtual void OnInstallSuccess(const Extension* extension, - SkBitmap* icon) OVERRIDE { + SkBitmap* icon) override { proxy_->set_extension_id(extension->id()); base::MessageLoopForUI::current()->Quit(); } - virtual void OnInstallFailure(const CrxInstallerError& error) OVERRIDE { + virtual void OnInstallFailure(const CrxInstallerError& error) override { proxy_->set_error(error.message()); base::MessageLoopForUI::current()->Quit(); } @@ -148,12 +148,12 @@ class ManagementPolicyMock : public extensions::ManagementPolicy::Provider { public: ManagementPolicyMock() {} - virtual std::string GetDebugPolicyProviderName() const OVERRIDE { + virtual std::string GetDebugPolicyProviderName() const override { return "ManagementPolicyMock"; } virtual bool UserMayLoad(const Extension* extension, - base::string16* error) const OVERRIDE { + base::string16* error) const override { *error = base::UTF8ToUTF16("Dummy error message"); return false; } diff --git a/chrome/browser/extensions/declarative_user_script_master.h b/chrome/browser/extensions/declarative_user_script_master.h index f4003bd..e454125 100644 --- a/chrome/browser/extensions/declarative_user_script_master.h +++ b/chrome/browser/extensions/declarative_user_script_master.h @@ -46,7 +46,7 @@ class DeclarativeUserScriptMaster : public ExtensionRegistryObserver { virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // ID of extension that owns scripts that this component manages. ExtensionId extension_id_; diff --git a/chrome/browser/extensions/default_apps.h b/chrome/browser/extensions/default_apps.h index 7a950e0..6a7927a 100644 --- a/chrome/browser/extensions/default_apps.h +++ b/chrome/browser/extensions/default_apps.h @@ -51,8 +51,8 @@ class Provider : public extensions::ExternalProviderImpl { bool ShouldInstallInProfile(); // ExternalProviderImpl overrides: - virtual void VisitRegisteredExtension() OVERRIDE; - virtual void SetPrefs(base::DictionaryValue* prefs) OVERRIDE; + virtual void VisitRegisteredExtension() override; + virtual void SetPrefs(base::DictionaryValue* prefs) override; private: Profile* profile_; diff --git a/chrome/browser/extensions/default_apps_unittest.cc b/chrome/browser/extensions/default_apps_unittest.cc index f84244f..770afe9 100644 --- a/chrome/browser/extensions/default_apps_unittest.cc +++ b/chrome/browser/extensions/default_apps_unittest.cc @@ -22,7 +22,7 @@ class MockExternalLoader : public ExternalLoader { public: MockExternalLoader() {} - virtual void StartLoading() OVERRIDE {} + virtual void StartLoading() override {} private: virtual ~MockExternalLoader() {} }; @@ -74,7 +74,7 @@ TEST_F(DefaultAppsTest, Install) { class DefaultTestingProfile : public TestingProfile { virtual bool WasCreatedByVersionOrLater( - const std::string& version) OVERRIDE { + const std::string& version) override { return false; } }; diff --git a/chrome/browser/extensions/dev_mode_bubble_controller.cc b/chrome/browser/extensions/dev_mode_bubble_controller.cc index c6b2ea8..7bb8e0b 100644 --- a/chrome/browser/extensions/dev_mode_bubble_controller.cc +++ b/chrome/browser/extensions/dev_mode_bubble_controller.cc @@ -38,25 +38,25 @@ class DevModeBubbleDelegate virtual ~DevModeBubbleDelegate(); // ExtensionMessageBubbleController::Delegate methods. - virtual bool ShouldIncludeExtension(const std::string& extension_id) OVERRIDE; + virtual bool ShouldIncludeExtension(const std::string& extension_id) override; virtual void AcknowledgeExtension( const std::string& extension_id, - ExtensionMessageBubbleController::BubbleAction user_action) OVERRIDE; - virtual void PerformAction(const ExtensionIdList& list) OVERRIDE; - virtual void OnClose() OVERRIDE; - virtual base::string16 GetTitle() const OVERRIDE; + ExtensionMessageBubbleController::BubbleAction user_action) override; + virtual void PerformAction(const ExtensionIdList& list) override; + virtual void OnClose() override; + virtual base::string16 GetTitle() const override; virtual base::string16 GetMessageBody( - bool anchored_to_browser_action) const OVERRIDE; + bool anchored_to_browser_action) const override; virtual base::string16 GetOverflowText( - const base::string16& overflow_count) const OVERRIDE; - virtual base::string16 GetLearnMoreLabel() const OVERRIDE; - virtual GURL GetLearnMoreUrl() const OVERRIDE; - virtual base::string16 GetActionButtonLabel() const OVERRIDE; - virtual base::string16 GetDismissButtonLabel() const OVERRIDE; - virtual bool ShouldShowExtensionList() const OVERRIDE; - virtual void LogExtensionCount(size_t count) OVERRIDE; + const base::string16& overflow_count) const override; + virtual base::string16 GetLearnMoreLabel() const override; + virtual GURL GetLearnMoreUrl() const override; + virtual base::string16 GetActionButtonLabel() const override; + virtual base::string16 GetDismissButtonLabel() const override; + virtual bool ShouldShowExtensionList() const override; + virtual void LogExtensionCount(size_t count) override; virtual void LogAction( - ExtensionMessageBubbleController::BubbleAction action) OVERRIDE; + ExtensionMessageBubbleController::BubbleAction action) override; private: // The associated profile (weak). diff --git a/chrome/browser/extensions/dev_mode_bubble_controller.h b/chrome/browser/extensions/dev_mode_bubble_controller.h index e93eaaf..4aaf1fe 100644 --- a/chrome/browser/extensions/dev_mode_bubble_controller.h +++ b/chrome/browser/extensions/dev_mode_bubble_controller.h @@ -30,7 +30,7 @@ class DevModeBubbleController : public ExtensionMessageBubbleController { bool ShouldShow(); // ExtensionMessageBubbleController methods. - virtual void Show(ExtensionMessageBubble* bubble) OVERRIDE; + virtual void Show(ExtensionMessageBubble* bubble) override; private: // A weak pointer to the profile we are associated with. Not owned by us. diff --git a/chrome/browser/extensions/display_info_provider_aura.h b/chrome/browser/extensions/display_info_provider_aura.h index 5b9aefb..16fef83 100644 --- a/chrome/browser/extensions/display_info_provider_aura.h +++ b/chrome/browser/extensions/display_info_provider_aura.h @@ -17,11 +17,11 @@ class DisplayInfoProviderAura : public DisplayInfoProvider { // DisplayInfoProvider implementation. virtual bool SetInfo(const std::string& display_id, const core_api::system_display::DisplayProperties& info, - std::string* error) OVERRIDE; + std::string* error) override; virtual void UpdateDisplayUnitInfoForPlatform( const gfx::Display& display, - core_api::system_display::DisplayUnitInfo* unit) OVERRIDE; - virtual gfx::Screen* GetActiveScreen() OVERRIDE; + core_api::system_display::DisplayUnitInfo* unit) override; + virtual gfx::Screen* GetActiveScreen() override; private: DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderAura); diff --git a/chrome/browser/extensions/display_info_provider_chromeos.h b/chrome/browser/extensions/display_info_provider_chromeos.h index e9cea2a..ea7dc69 100644 --- a/chrome/browser/extensions/display_info_provider_chromeos.h +++ b/chrome/browser/extensions/display_info_provider_chromeos.h @@ -17,11 +17,11 @@ class DisplayInfoProviderChromeOS : public DisplayInfoProvider { // DisplayInfoProvider implementation. virtual bool SetInfo(const std::string& display_id, const core_api::system_display::DisplayProperties& info, - std::string* error) OVERRIDE; + std::string* error) override; virtual void UpdateDisplayUnitInfoForPlatform( const gfx::Display& display, - core_api::system_display::DisplayUnitInfo* unit) OVERRIDE; - virtual gfx::Screen* GetActiveScreen() OVERRIDE; + core_api::system_display::DisplayUnitInfo* unit) override; + virtual gfx::Screen* GetActiveScreen() override; private: DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderChromeOS); diff --git a/chrome/browser/extensions/display_info_provider_mac.h b/chrome/browser/extensions/display_info_provider_mac.h index bdaae6d..59a919b 100644 --- a/chrome/browser/extensions/display_info_provider_mac.h +++ b/chrome/browser/extensions/display_info_provider_mac.h @@ -17,11 +17,11 @@ class DisplayInfoProviderMac : public DisplayInfoProvider { // DisplayInfoProvider implementation. virtual bool SetInfo(const std::string& display_id, const core_api::system_display::DisplayProperties& info, - std::string* error) OVERRIDE; + std::string* error) override; virtual void UpdateDisplayUnitInfoForPlatform( const gfx::Display& display, - core_api::system_display::DisplayUnitInfo* unit) OVERRIDE; - virtual gfx::Screen* GetActiveScreen() OVERRIDE; + core_api::system_display::DisplayUnitInfo* unit) override; + virtual gfx::Screen* GetActiveScreen() override; private: DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderMac); diff --git a/chrome/browser/extensions/display_info_provider_win.h b/chrome/browser/extensions/display_info_provider_win.h index af5f35a..e61b081 100644 --- a/chrome/browser/extensions/display_info_provider_win.h +++ b/chrome/browser/extensions/display_info_provider_win.h @@ -17,11 +17,11 @@ class DisplayInfoProviderWin : public DisplayInfoProvider { // DisplayInfoProvider implementation. virtual bool SetInfo(const std::string& display_id, const core_api::system_display::DisplayProperties& info, - std::string* error) OVERRIDE; + std::string* error) override; virtual void UpdateDisplayUnitInfoForPlatform( const gfx::Display& display, - core_api::system_display::DisplayUnitInfo* unit) OVERRIDE; - virtual gfx::Screen* GetActiveScreen() OVERRIDE; + core_api::system_display::DisplayUnitInfo* unit) override; + virtual gfx::Screen* GetActiveScreen() override; private: DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderWin); 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 diff --git a/chrome/browser/extensions/extension_action.cc b/chrome/browser/extensions/extension_action.cc index 9a4330b..01536af 100644 --- a/chrome/browser/extensions/extension_action.cc +++ b/chrome/browser/extensions/extension_action.cc @@ -42,7 +42,7 @@ class GetAttentionImageSource : public gfx::ImageSkiaSource { : icon_(icon) {} // gfx::ImageSkiaSource overrides: - virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE { + virtual gfx::ImageSkiaRep GetImageForScale(float scale) override { gfx::ImageSkiaRep icon_rep = icon_.GetRepresentation(scale); color_utils::HSL shift = {-1, 0, 0.5}; return gfx::ImageSkiaRep( diff --git a/chrome/browser/extensions/extension_action_icon_factory.h b/chrome/browser/extensions/extension_action_icon_factory.h index bf3461e..6869e8e 100644 --- a/chrome/browser/extensions/extension_action_icon_factory.h +++ b/chrome/browser/extensions/extension_action_icon_factory.h @@ -39,7 +39,7 @@ class ExtensionActionIconFactory : public extensions::IconImage::Observer { // extensions::IconImage override. virtual void OnExtensionIconImageChanged( - extensions::IconImage* image) OVERRIDE; + extensions::IconImage* image) override; // Gets the extension action icon for the tab. // If there is an icon set using |SetIcon|, that icon is returned. diff --git a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc index 1bb071f..690d417 100644 --- a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc +++ b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc @@ -129,7 +129,7 @@ class ExtensionActionIconFactoryTest } // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { file_thread_.Start(); io_thread_.Start(); profile_.reset(new TestingProfile); @@ -139,13 +139,13 @@ class ExtensionActionIconFactoryTest CreateExtensionService(&command_line, base::FilePath(), false); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { profile_.reset(); // Get all DeleteSoon calls sent to ui_loop_. ui_loop_.RunUntilIdle(); } // ExtensionActionIconFactory::Observer overrides: - virtual void OnIconUpdated() OVERRIDE { + virtual void OnIconUpdated() override { if (quit_in_icon_updated_) base::MessageLoop::current()->Quit(); } diff --git a/chrome/browser/extensions/extension_action_manager.cc b/chrome/browser/extensions/extension_action_manager.cc index 14ab141..98c8a77 100644 --- a/chrome/browser/extensions/extension_action_manager.cc +++ b/chrome/browser/extensions/extension_action_manager.cc @@ -40,12 +40,12 @@ class ExtensionActionManagerFactory : public BrowserContextKeyedServiceFactory { } virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE { + content::BrowserContext* profile) const override { return new ExtensionActionManager(static_cast<Profile*>(profile)); } virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE { + content::BrowserContext* context) const override { return ExtensionsBrowserClient::Get()->GetOriginalContext(context); } }; diff --git a/chrome/browser/extensions/extension_action_manager.h b/chrome/browser/extensions/extension_action_manager.h index 0d78277..6f602bd 100644 --- a/chrome/browser/extensions/extension_action_manager.h +++ b/chrome/browser/extensions/extension_action_manager.h @@ -59,7 +59,7 @@ class ExtensionActionManager : public KeyedService, virtual void OnExtensionUnloaded(content::BrowserContext* browser_context, const Extension* extension, UnloadedExtensionInfo::Reason reason) - OVERRIDE; + override; Profile* profile_; diff --git a/chrome/browser/extensions/extension_action_storage_manager.h b/chrome/browser/extensions/extension_action_storage_manager.h index 37b2ed5..34d9dc5 100644 --- a/chrome/browser/extensions/extension_action_storage_manager.h +++ b/chrome/browser/extensions/extension_action_storage_manager.h @@ -34,12 +34,12 @@ class ExtensionActionStorageManager : public ExtensionActionAPI::Observer, virtual void OnExtensionActionUpdated( ExtensionAction* extension_action, content::WebContents* web_contents, - content::BrowserContext* browser_context) OVERRIDE; - virtual void OnExtensionActionAPIShuttingDown() OVERRIDE; + content::BrowserContext* browser_context) override; + virtual void OnExtensionActionAPIShuttingDown() override; // ExtensionRegistryObserver: virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; // Reads/Writes the ExtensionAction's default values to/from storage. void WriteToStorage(ExtensionAction* extension_action); diff --git a/chrome/browser/extensions/extension_api_unittest.h b/chrome/browser/extensions/extension_api_unittest.h index 88f335e..c210f8b 100644 --- a/chrome/browser/extensions/extension_api_unittest.h +++ b/chrome/browser/extensions/extension_api_unittest.h @@ -52,7 +52,7 @@ class ExtensionApiUnittest : public BrowserWithTestWindowTest { protected: // SetUp creates and loads an empty, unpacked Extension. - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; // Creates a background page for |extension_|, and sets it for the WebContents // to be used in API calls. diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h index 4664878..51c5721 100644 --- a/chrome/browser/extensions/extension_apitest.h +++ b/chrome/browser/extensions/extension_apitest.h @@ -65,8 +65,8 @@ class ExtensionApiTest : public ExtensionBrowserTest { protected: // InProcessBrowserTest: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE; + virtual void SetUpInProcessBrowserTestFixture() override; + virtual void TearDownInProcessBrowserTestFixture() override; // Load |extension_name| and wait for pass / fail notification. // |extension_name| is a directory in "test/data/extensions/api_test". @@ -149,7 +149,7 @@ class ExtensionApiTest : public ExtensionBrowserTest { const extensions::Extension* GetSingleLoadedExtension(); // All extensions tested by ExtensionApiTest are in the "api_test" dir. - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; + virtual void SetUpCommandLine(base::CommandLine* command_line) override; // If it failed, what was the error message? std::string message_; diff --git a/chrome/browser/extensions/extension_assets_manager.cc b/chrome/browser/extensions/extension_assets_manager.cc index df594d0..6b74ede 100644 --- a/chrome/browser/extensions/extension_assets_manager.cc +++ b/chrome/browser/extensions/extension_assets_manager.cc @@ -26,7 +26,7 @@ class ExtensionAssetsManagerImpl : public ExtensionAssetsManager { const base::FilePath& unpacked_extension_root, const base::FilePath& local_install_dir, Profile* profile, - InstallExtensionCallback callback) OVERRIDE { + InstallExtensionCallback callback) override { callback.Run(file_util::InstallExtension( unpacked_extension_root, extension->id(), @@ -38,7 +38,7 @@ class ExtensionAssetsManagerImpl : public ExtensionAssetsManager { const std::string& id, Profile* profile, const base::FilePath& local_install_dir, - const base::FilePath& extension_root) OVERRIDE { + const base::FilePath& extension_root) override { file_util::UninstallExtension(local_install_dir, id); } diff --git a/chrome/browser/extensions/extension_assets_manager_chromeos.h b/chrome/browser/extensions/extension_assets_manager_chromeos.h index 298c991..01d98be 100644 --- a/chrome/browser/extensions/extension_assets_manager_chromeos.h +++ b/chrome/browser/extensions/extension_assets_manager_chromeos.h @@ -42,12 +42,12 @@ class ExtensionAssetsManagerChromeOS : public ExtensionAssetsManager { const base::FilePath& unpacked_extension_root, const base::FilePath& local_install_dir, Profile* profile, - InstallExtensionCallback callback) OVERRIDE; + InstallExtensionCallback callback) override; virtual void UninstallExtension( const std::string& id, Profile* profile, const base::FilePath& local_install_dir, - const base::FilePath& extension_root) OVERRIDE; + const base::FilePath& extension_root) override; // Return shared install dir. static base::FilePath GetSharedInstallDir(); diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index 7ac8865..98416cd 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -346,16 +346,16 @@ class MockAbortExtensionInstallPrompt : public ExtensionInstallPrompt { virtual void ConfirmInstall( Delegate* delegate, const Extension* extension, - const ShowDialogCallback& show_dialog_callback) OVERRIDE { + const ShowDialogCallback& show_dialog_callback) override { delegate->InstallUIAbort(true); base::MessageLoopForUI::current()->Quit(); } virtual void OnInstallSuccess(const Extension* extension, - SkBitmap* icon) OVERRIDE {} + SkBitmap* icon) override {} virtual void OnInstallFailure( - const extensions::CrxInstallerError& error) OVERRIDE {} + const extensions::CrxInstallerError& error) override {} }; class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt { @@ -368,7 +368,7 @@ class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt { virtual void ConfirmInstall( Delegate* delegate, const Extension* extension, - const ShowDialogCallback& show_dialog_callback) OVERRIDE { + const ShowDialogCallback& show_dialog_callback) override { delegate->InstallUIProceed(); } }; diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h index d5a9b58..a2bdb99 100644 --- a/chrome/browser/extensions/extension_browsertest.h +++ b/chrome/browser/extensions/extension_browsertest.h @@ -75,9 +75,9 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest { const extensions::ExtensionSet* extensions, const base::FilePath& path); // InProcessBrowserTest - virtual void SetUp() OVERRIDE; - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; + virtual void SetUp() override; + virtual void SetUpCommandLine(base::CommandLine* command_line) override; + virtual void SetUpOnMainThread() override; const extensions::Extension* LoadExtension(const base::FilePath& path); diff --git a/chrome/browser/extensions/extension_commands_global_registry.h b/chrome/browser/extensions/extension_commands_global_registry.h index c27f75c..ccf0061 100644 --- a/chrome/browser/extensions/extension_commands_global_registry.h +++ b/chrome/browser/extensions/extension_commands_global_registry.h @@ -72,14 +72,14 @@ class ExtensionCommandsGlobalRegistry // Overridden from ExtensionKeybindingRegistry: virtual void AddExtensionKeybinding( const Extension* extension, - const std::string& command_name) OVERRIDE; + const std::string& command_name) override; virtual void RemoveExtensionKeybindingImpl( const ui::Accelerator& accelerator, - const std::string& command_name) OVERRIDE; + const std::string& command_name) override; // Called by the GlobalShortcutListener object when a shortcut this class has // registered for has been pressed. - virtual void OnKeyPressed(const ui::Accelerator& accelerator) OVERRIDE; + virtual void OnKeyPressed(const ui::Accelerator& accelerator) override; // Weak pointer to our browser context. Not owned by us. content::BrowserContext* browser_context_; diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc index fef404d..2ef63d1 100644 --- a/chrome/browser/extensions/extension_context_menu_browsertest.cc +++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc @@ -552,7 +552,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionContextMenuBrowserTest, Enabled) { class ExtensionContextMenuBrowserLazyTest : public ExtensionContextMenuBrowserTest { - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionContextMenuBrowserTest::SetUpOnMainThread(); // Set shorter delays to prevent test timeouts. extensions::ProcessManager::SetEventPageIdleTimeForTesting(1); diff --git a/chrome/browser/extensions/extension_context_menu_model.h b/chrome/browser/extensions/extension_context_menu_model.h index e4f36e0..ec6f1d5 100644 --- a/chrome/browser/extensions/extension_context_menu_model.h +++ b/chrome/browser/extensions/extension_context_menu_model.h @@ -71,16 +71,16 @@ class ExtensionContextMenuModel Browser* browser); // SimpleMenuModel::Delegate overrides. - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; + virtual bool IsCommandIdChecked(int command_id) const override; + virtual bool IsCommandIdEnabled(int command_id) const override; virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) OVERRIDE; - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; + ui::Accelerator* accelerator) override; + virtual void ExecuteCommand(int command_id, int event_flags) override; // ExtensionUninstallDialog::Delegate: - virtual void ExtensionUninstallAccepted() OVERRIDE; - virtual void ExtensionUninstallCanceled() OVERRIDE; + virtual void ExtensionUninstallAccepted() override; + virtual void ExtensionUninstallCanceled() override; private: friend class base::RefCounted<ExtensionContextMenuModel>; diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc index 3f577d7..145eb47 100644 --- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc +++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc @@ -130,7 +130,7 @@ class ExtensionCrashRecoveryTestBase : public ExtensionBrowserTest { class MAYBE_ExtensionCrashRecoveryTest : public ExtensionCrashRecoveryTestBase { protected: - virtual void AcceptNotification(size_t index) OVERRIDE { + virtual void AcceptNotification(size_t index) override { message_center::MessageCenter* message_center = message_center::MessageCenter::Get(); ASSERT_GT(message_center->NotificationCount(), index); @@ -143,7 +143,7 @@ class MAYBE_ExtensionCrashRecoveryTest : public ExtensionCrashRecoveryTestBase { WaitForExtensionLoad(); } - virtual void CancelNotification(size_t index) OVERRIDE { + virtual void CancelNotification(size_t index) override { message_center::MessageCenter* message_center = message_center::MessageCenter::Get(); ASSERT_GT(message_center->NotificationCount(), index); @@ -155,7 +155,7 @@ class MAYBE_ExtensionCrashRecoveryTest : public ExtensionCrashRecoveryTestBase { CancelById((*it)->id())); } - virtual size_t CountBalloons() OVERRIDE { + virtual size_t CountBalloons() override { return message_center::MessageCenter::Get()->NotificationCount(); } }; diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc index b25d95f..c2472c4 100644 --- a/chrome/browser/extensions/extension_disabled_ui.cc +++ b/chrome/browser/extensions/extension_disabled_ui.cc @@ -100,8 +100,8 @@ class ExtensionDisabledDialogDelegate virtual ~ExtensionDisabledDialogDelegate(); // ExtensionInstallPrompt::Delegate: - virtual void InstallUIProceed() OVERRIDE; - virtual void InstallUIAbort(bool user_initiated) OVERRIDE; + virtual void InstallUIProceed() override; + virtual void InstallUIAbort(bool user_initiated) override; // The UI for showing the install dialog when enabling. scoped_ptr<ExtensionInstallPrompt> install_ui_; @@ -154,29 +154,29 @@ class ExtensionDisabledGlobalError virtual ~ExtensionDisabledGlobalError(); // GlobalError implementation. - virtual Severity GetSeverity() OVERRIDE; - virtual bool HasMenuItem() OVERRIDE; - virtual int MenuItemCommandID() OVERRIDE; - virtual base::string16 MenuItemLabel() OVERRIDE; - virtual void ExecuteMenuItem(Browser* browser) OVERRIDE; - virtual gfx::Image GetBubbleViewIcon() OVERRIDE; - virtual base::string16 GetBubbleViewTitle() OVERRIDE; - virtual std::vector<base::string16> GetBubbleViewMessages() OVERRIDE; - virtual base::string16 GetBubbleViewAcceptButtonLabel() OVERRIDE; - virtual base::string16 GetBubbleViewCancelButtonLabel() OVERRIDE; - virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE; - virtual void BubbleViewAcceptButtonPressed(Browser* browser) OVERRIDE; - virtual void BubbleViewCancelButtonPressed(Browser* browser) OVERRIDE; - virtual bool ShouldCloseOnDeactivate() const OVERRIDE; + virtual Severity GetSeverity() override; + virtual bool HasMenuItem() override; + virtual int MenuItemCommandID() override; + virtual base::string16 MenuItemLabel() override; + virtual void ExecuteMenuItem(Browser* browser) override; + virtual gfx::Image GetBubbleViewIcon() override; + virtual base::string16 GetBubbleViewTitle() override; + virtual std::vector<base::string16> GetBubbleViewMessages() override; + virtual base::string16 GetBubbleViewAcceptButtonLabel() override; + virtual base::string16 GetBubbleViewCancelButtonLabel() override; + virtual void OnBubbleViewDidClose(Browser* browser) override; + virtual void BubbleViewAcceptButtonPressed(Browser* browser) override; + virtual void BubbleViewCancelButtonPressed(Browser* browser) override; + virtual bool ShouldCloseOnDeactivate() const override; // ExtensionUninstallDialog::Delegate implementation. - virtual void ExtensionUninstallAccepted() OVERRIDE; - virtual void ExtensionUninstallCanceled() OVERRIDE; + virtual void ExtensionUninstallAccepted() override; + virtual void ExtensionUninstallCanceled() override; // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: ExtensionService* service_; diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc index a6989b7..10228c9 100644 --- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc @@ -34,13 +34,13 @@ using extensions::ExtensionPrefs; class ExtensionDisabledGlobalErrorTest : public ExtensionBrowserTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII(switches::kAppsGalleryUpdateURL, "http://localhost/autoupdate/updates.xml"); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { EXPECT_TRUE(scoped_temp_dir_.CreateUniqueTempDir()); service_ = extensions::ExtensionSystem::Get( browser()->profile())->extension_service(); diff --git a/chrome/browser/extensions/extension_error_controller.h b/chrome/browser/extensions/extension_error_controller.h index a86e8f6..26987d2 100644 --- a/chrome/browser/extensions/extension_error_controller.h +++ b/chrome/browser/extensions/extension_error_controller.h @@ -32,12 +32,12 @@ class ExtensionErrorController : public ExtensionErrorUI::Delegate { private: // ExtensionErrorUI::Delegate implementation: - virtual content::BrowserContext* GetContext() OVERRIDE; - virtual const ExtensionSet& GetExternalExtensions() OVERRIDE; - virtual const ExtensionSet& GetBlacklistedExtensions() OVERRIDE; - virtual void OnAlertDetails() OVERRIDE; - virtual void OnAlertAccept() OVERRIDE; - virtual void OnAlertClosed() OVERRIDE; + virtual content::BrowserContext* GetContext() override; + virtual const ExtensionSet& GetExternalExtensions() override; + virtual const ExtensionSet& GetBlacklistedExtensions() override; + virtual void OnAlertDetails() override; + virtual void OnAlertAccept() override; + virtual void OnAlertClosed() override; // Find any extensions that the user should be alerted about (like blacklisted // extensions). diff --git a/chrome/browser/extensions/extension_error_controller_unittest.cc b/chrome/browser/extensions/extension_error_controller_unittest.cc index 2868a67..87f7d6c 100644 --- a/chrome/browser/extensions/extension_error_controller_unittest.cc +++ b/chrome/browser/extensions/extension_error_controller_unittest.cc @@ -37,9 +37,9 @@ class MockExtensionErrorUI : public ExtensionErrorUI { private: // ExtensionErrorUI implementation. - virtual bool ShowErrorInBubbleView() OVERRIDE; - virtual void ShowExtensions() OVERRIDE; - virtual void Close() OVERRIDE; + virtual bool ShowErrorInBubbleView() override; + virtual void ShowExtensions() override; + virtual void Close() override; // Keep a copy of the delegate around for ourselves. ExtensionErrorUI::Delegate* delegate_; @@ -104,7 +104,7 @@ scoped_refptr<const Extension> BuildExtension() { class ExtensionErrorControllerUnitTest : public ExtensionServiceTestBase { protected: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; // Add an extension to chrome, and mark it as blacklisted in the prefs. testing::AssertionResult AddBlacklistedExtension(const Extension* extension); diff --git a/chrome/browser/extensions/extension_error_ui_default.h b/chrome/browser/extensions/extension_error_ui_default.h index 5b5407d..b080857 100644 --- a/chrome/browser/extensions/extension_error_ui_default.h +++ b/chrome/browser/extensions/extension_error_ui_default.h @@ -22,9 +22,9 @@ class ExtensionErrorUIDefault : public ExtensionErrorUI { virtual ~ExtensionErrorUIDefault(); // ExtensionErrorUI implementation: - virtual bool ShowErrorInBubbleView() OVERRIDE; - virtual void ShowExtensions() OVERRIDE; - virtual void Close() OVERRIDE; + virtual bool ShowErrorInBubbleView() override; + virtual void ShowExtensions() override; + virtual void Close() override; private: class ExtensionGlobalError : public GlobalErrorWithStandardBubble { @@ -33,17 +33,17 @@ class ExtensionErrorUIDefault : public ExtensionErrorUI { private: // GlobalError methods. - virtual bool HasMenuItem() OVERRIDE; - virtual int MenuItemCommandID() OVERRIDE; - virtual base::string16 MenuItemLabel() OVERRIDE; - virtual void ExecuteMenuItem(Browser* browser) OVERRIDE; - virtual base::string16 GetBubbleViewTitle() OVERRIDE; - virtual std::vector<base::string16> GetBubbleViewMessages() OVERRIDE; - virtual base::string16 GetBubbleViewAcceptButtonLabel() OVERRIDE; - virtual base::string16 GetBubbleViewCancelButtonLabel() OVERRIDE; - virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE; - virtual void BubbleViewAcceptButtonPressed(Browser* browser) OVERRIDE; - virtual void BubbleViewCancelButtonPressed(Browser* browser) OVERRIDE; + virtual bool HasMenuItem() override; + virtual int MenuItemCommandID() override; + virtual base::string16 MenuItemLabel() override; + virtual void ExecuteMenuItem(Browser* browser) override; + virtual base::string16 GetBubbleViewTitle() override; + virtual std::vector<base::string16> GetBubbleViewMessages() override; + virtual base::string16 GetBubbleViewAcceptButtonLabel() override; + virtual base::string16 GetBubbleViewCancelButtonLabel() override; + virtual void OnBubbleViewDidClose(Browser* browser) override; + virtual void BubbleViewAcceptButtonPressed(Browser* browser) override; + virtual void BubbleViewCancelButtonPressed(Browser* browser) override; // The ExtensionErrorUIDefault who owns us. ExtensionErrorUIDefault* error_ui_; diff --git a/chrome/browser/extensions/extension_function_test_utils.cc b/chrome/browser/extensions/extension_function_test_utils.cc index 503709b..1d3b84a 100644 --- a/chrome/browser/extensions/extension_function_test_utils.cc +++ b/chrome/browser/extensions/extension_function_test_utils.cc @@ -36,11 +36,11 @@ class TestFunctionDispatcherDelegate private: virtual extensions::WindowController* GetExtensionWindowController() - const OVERRIDE { + const override { return browser_->extension_window_controller(); } - virtual WebContents* GetAssociatedWebContents() const OVERRIDE { + virtual WebContents* GetAssociatedWebContents() const override { return NULL; } @@ -211,7 +211,7 @@ class SendResponseDelegate virtual void OnSendResponse(UIThreadExtensionFunction* function, bool success, - bool bad_message) OVERRIDE { + bool bad_message) override { ASSERT_FALSE(bad_message); ASSERT_FALSE(HasResponse()); response_.reset(new bool); diff --git a/chrome/browser/extensions/extension_garbage_collector.h b/chrome/browser/extensions/extension_garbage_collector.h index c0805ca9..2f56cf6 100644 --- a/chrome/browser/extensions/extension_garbage_collector.h +++ b/chrome/browser/extensions/extension_garbage_collector.h @@ -35,12 +35,12 @@ class ExtensionGarbageCollector : public KeyedService, public InstallObserver { void GarbageCollectExtensionsForTest(); // Overriddes for KeyedService: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // Overriddes for InstallObserver - virtual void OnBeginCrxInstall(const std::string& extension_id) OVERRIDE; + virtual void OnBeginCrxInstall(const std::string& extension_id) override; virtual void OnFinishCrxInstall(const std::string& extension_id, - bool success) OVERRIDE; + bool success) override; protected: // Cleans up the extension install directory. It can end up with garbage in it diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos.h b/chrome/browser/extensions/extension_garbage_collector_chromeos.h index aad9a2e..8b84b0e 100644 --- a/chrome/browser/extensions/extension_garbage_collector_chromeos.h +++ b/chrome/browser/extensions/extension_garbage_collector_chromeos.h @@ -30,7 +30,7 @@ class ExtensionGarbageCollectorChromeOS : public ExtensionGarbageCollector { private: // Overriddes for ExtensionGarbageCollector: - virtual void GarbageCollectExtensions() OVERRIDE; + virtual void GarbageCollectExtensions() override; // Return true if there is no extension installation for all active profiles. bool CanGarbageCollectSharedExtensions(); diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc index ca43e32..5d23b6c 100644 --- a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc +++ b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc @@ -45,7 +45,7 @@ class ExtensionGarbageCollectorChromeOSUnitTest PrefService& local_state() { return local_state_; } const base::FilePath& cache_dir() { return cache_dir_.path(); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_); chrome::RegisterLocalState(local_state_.registry()); @@ -76,7 +76,7 @@ class ExtensionGarbageCollectorChromeOSUnitTest GetFakeUserManager()->GetActiveUser(), profile_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { TestingBrowserProcess::GetGlobal()->SetLocalState(NULL); } diff --git a/chrome/browser/extensions/extension_garbage_collector_factory.h b/chrome/browser/extensions/extension_garbage_collector_factory.h index f1ce77d..19f0bf6 100644 --- a/chrome/browser/extensions/extension_garbage_collector_factory.h +++ b/chrome/browser/extensions/extension_garbage_collector_factory.h @@ -34,10 +34,10 @@ class ExtensionGarbageCollectorFactory // BrowserContextKeyedServiceFactory overrides: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; DISALLOW_COPY_AND_ASSIGN(ExtensionGarbageCollectorFactory); }; diff --git a/chrome/browser/extensions/extension_gcm_app_handler.h b/chrome/browser/extensions/extension_gcm_app_handler.h index 9e743c2..1eb9aeb 100644 --- a/chrome/browser/extensions/extension_gcm_app_handler.h +++ b/chrome/browser/extensions/extension_gcm_app_handler.h @@ -46,16 +46,16 @@ class ExtensionGCMAppHandler : public gcm::GCMAppHandler, GetFactoryInstance(); // gcm::GCMAppHandler implementation. - virtual void ShutdownHandler() OVERRIDE; + virtual void ShutdownHandler() override; virtual void OnMessage( const std::string& app_id, - const gcm::GCMClient::IncomingMessage& message) OVERRIDE; - virtual void OnMessagesDeleted(const std::string& app_id) OVERRIDE; + const gcm::GCMClient::IncomingMessage& message) override; + virtual void OnMessagesDeleted(const std::string& app_id) override; virtual void OnSendError( const std::string& app_id, - const gcm::GCMClient::SendErrorDetails& send_error_details) OVERRIDE; + const gcm::GCMClient::SendErrorDetails& send_error_details) override; virtual void OnSendAcknowledged(const std::string& app_id, - const std::string& message_id) OVERRIDE; + const std::string& message_id) override; protected: // Could be overridden by testing purpose. @@ -71,15 +71,15 @@ private: // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; virtual void OnExtensionUninstalled( content::BrowserContext* browser_context, const Extension* extension, - extensions::UninstallReason reason) OVERRIDE; + extensions::UninstallReason reason) override; void AddDummyAppHandler(); void RemoveDummyAppHandler(); diff --git a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc index b0b51d1..b9a20bb 100644 --- a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc +++ b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc @@ -145,24 +145,24 @@ class FakeExtensionGCMAppHandler : public ExtensionGCMAppHandler { virtual void OnMessage( const std::string& app_id, - const gcm::GCMClient::IncomingMessage& message) OVERRIDE { + const gcm::GCMClient::IncomingMessage& message) override { } - virtual void OnMessagesDeleted(const std::string& app_id) OVERRIDE { + virtual void OnMessagesDeleted(const std::string& app_id) override { } virtual void OnSendError( const std::string& app_id, - const gcm::GCMClient::SendErrorDetails& send_error_details) OVERRIDE { + const gcm::GCMClient::SendErrorDetails& send_error_details) override { } virtual void OnUnregisterCompleted(const std::string& app_id, - gcm::GCMClient::Result result) OVERRIDE { + gcm::GCMClient::Result result) override { unregistration_result_ = result; waiter_->SignalCompleted(); } - virtual void RemoveAppHandler(const std::string& app_id) OVERRIDE{ + virtual void RemoveAppHandler(const std::string& app_id) override{ ExtensionGCMAppHandler::RemoveAppHandler(app_id); if (!GetGCMDriver()->app_handlers().size()) app_handler_count_drop_to_zero_ = true; @@ -207,7 +207,7 @@ class ExtensionGCMAppHandlerTest : public testing::Test { } // Overridden from test::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); // Make BrowserThread work in unittest. @@ -258,7 +258,7 @@ class ExtensionGCMAppHandlerTest : public testing::Test { gcm_app_handler_.reset(new FakeExtensionGCMAppHandler(profile(), &waiter_)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { #if defined(OS_CHROMEOS) test_user_manager_.reset(); #endif diff --git a/chrome/browser/extensions/extension_geolocation_apitest.cc b/chrome/browser/extensions/extension_geolocation_apitest.cc index a8a26de..411305f 100644 --- a/chrome/browser/extensions/extension_geolocation_apitest.cc +++ b/chrome/browser/extensions/extension_geolocation_apitest.cc @@ -11,7 +11,7 @@ class GeolocationApiTest : public ExtensionApiTest { } // InProcessBrowserTest - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ui_test_utils::OverrideGeolocation(0, 0); } }; diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc index 8dcb5ca..f9a2096 100644 --- a/chrome/browser/extensions/extension_icon_manager_unittest.cc +++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc @@ -79,7 +79,7 @@ class TestIconManager : public ExtensionIconManager { // Overrides the ImageLoader callback, and calls through to the base class' // implementation. Then it lets the test know that an image load was observed. virtual void OnImageLoaded(const std::string& extension_id, - const gfx::Image& image) OVERRIDE { + const gfx::Image& image) override { ExtensionIconManager::OnImageLoaded(extension_id, image); test_->ImageLoadObserved(); } diff --git a/chrome/browser/extensions/extension_icon_source_apitest.cc b/chrome/browser/extensions/extension_icon_source_apitest.cc index db7a808..38be9b4 100644 --- a/chrome/browser/extensions/extension_icon_source_apitest.cc +++ b/chrome/browser/extensions/extension_icon_source_apitest.cc @@ -17,7 +17,7 @@ class ExtensionIconSourceTest : public ExtensionApiTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitch( extensions::switches::kAllowLegacyExtensionManifests); diff --git a/chrome/browser/extensions/extension_infobar_delegate.h b/chrome/browser/extensions/extension_infobar_delegate.h index ec0f98d..ce4ed66 100644 --- a/chrome/browser/extensions/extension_infobar_delegate.h +++ b/chrome/browser/extensions/extension_infobar_delegate.h @@ -69,21 +69,21 @@ class ExtensionInfoBarDelegate : public infobars::InfoBarDelegate, // InfoBarDelegate. virtual bool EqualsDelegate( - infobars::InfoBarDelegate* delegate) const OVERRIDE; - virtual void InfoBarDismissed() OVERRIDE; - virtual Type GetInfoBarType() const OVERRIDE; - virtual ExtensionInfoBarDelegate* AsExtensionInfoBarDelegate() OVERRIDE; + infobars::InfoBarDelegate* delegate) const override; + virtual void InfoBarDismissed() override; + virtual Type GetInfoBarType() const override; + virtual ExtensionInfoBarDelegate* AsExtensionInfoBarDelegate() override; // content::NotificationObserver. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // extensions::ExtensionRegistryObserver. virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const extensions::Extension* extension, - extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE; + extensions::UnloadedExtensionInfo::Reason reason) override; #if defined(TOOLKIT_VIEWS) Browser* browser_; // We pass this to the ExtensionInfoBar. diff --git a/chrome/browser/extensions/extension_install_checker_unittest.cc b/chrome/browser/extensions/extension_install_checker_unittest.cc index dbbcaa9..24da77c 100644 --- a/chrome/browser/extensions/extension_install_checker_unittest.cc +++ b/chrome/browser/extensions/extension_install_checker_unittest.cc @@ -60,23 +60,23 @@ class ExtensionInstallCheckerForTest : public ExtensionInstallChecker { } protected: - virtual void CheckRequirements() OVERRIDE { + virtual void CheckRequirements() override { requirements_check_called_ = true; MockCheckRequirements(current_sequence_number()); } - virtual void CheckManagementPolicy() OVERRIDE { + virtual void CheckManagementPolicy() override { policy_check_called_ = true; OnManagementPolicyCheckDone(policy_check_error_.empty(), policy_check_error_); } - virtual void CheckBlacklistState() OVERRIDE { + virtual void CheckBlacklistState() override { blacklist_check_called_ = true; MockCheckBlacklistState(current_sequence_number()); } - virtual void ResetResults() OVERRIDE { + virtual void ResetResults() override { ExtensionInstallChecker::ResetResults(); requirements_check_called_ = false; @@ -98,7 +98,7 @@ class ExtensionInstallCheckerForTest : public ExtensionInstallChecker { // checks. class ExtensionInstallCheckerAsync : public ExtensionInstallCheckerForTest { protected: - virtual void CheckRequirements() OVERRIDE { + virtual void CheckRequirements() override { requirements_check_called_ = true; base::MessageLoop::current()->PostTask( @@ -108,7 +108,7 @@ class ExtensionInstallCheckerAsync : public ExtensionInstallCheckerForTest { current_sequence_number())); } - virtual void CheckBlacklistState() OVERRIDE { + virtual void CheckBlacklistState() override { blacklist_check_called_ = true; base::MessageLoop::current()->PostTask( diff --git a/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chrome/browser/extensions/extension_install_ui_browsertest.cc index 9834111..110efdd 100644 --- a/chrome/browser/extensions/extension_install_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_install_ui_browsertest.cc @@ -199,7 +199,7 @@ class NewTabUISortingBrowserTest : public ExtensionInstallUIBrowserTest, virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { if (type != chrome::NOTIFICATION_APP_LAUNCHER_REORDERED) { observer_->Observe(type, source, details); return; diff --git a/chrome/browser/extensions/extension_keybinding_registry.h b/chrome/browser/extensions/extension_keybinding_registry.h index 86bb2c6..ddc911a 100644 --- a/chrome/browser/extensions/extension_keybinding_registry.h +++ b/chrome/browser/extensions/extension_keybinding_registry.h @@ -128,15 +128,15 @@ class ExtensionKeybindingRegistry : public content::NotificationObserver, // Overridden from content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // Returns true if the |extension| matches our extension filter. bool ExtensionMatchesFilter(const extensions::Extension* extension); diff --git a/chrome/browser/extensions/extension_management.h b/chrome/browser/extensions/extension_management.h index 5cea880..d7410e2 100644 --- a/chrome/browser/extensions/extension_management.h +++ b/chrome/browser/extensions/extension_management.h @@ -168,11 +168,11 @@ class ExtensionManagementFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceExtensionManagementFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual void RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) OVERRIDE; + user_prefs::PrefRegistrySyncable* registry) override; DISALLOW_COPY_AND_ASSIGN(ExtensionManagementFactory); }; diff --git a/chrome/browser/extensions/extension_management_unittest.cc b/chrome/browser/extensions/extension_management_unittest.cc index 35f12f5..fc100f5 100644 --- a/chrome/browser/extensions/extension_management_unittest.cc +++ b/chrome/browser/extensions/extension_management_unittest.cc @@ -61,7 +61,7 @@ class ExtensionManagementServiceTest : public testing::Test { virtual ~ExtensionManagementServiceTest() {} // testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { InitPrefService(); } diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc index cc32877..f382074 100644 --- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc +++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc @@ -79,17 +79,17 @@ class TestSuspiciousExtensionBubbleController : SuspiciousExtensionBubbleController(profile) { } - virtual void OnBubbleAction() OVERRIDE { + virtual void OnBubbleAction() override { ++action_button_callback_count_; SuspiciousExtensionBubbleController::OnBubbleAction(); } - virtual void OnBubbleDismiss() OVERRIDE { + virtual void OnBubbleDismiss() override { ++dismiss_button_callback_count_; SuspiciousExtensionBubbleController::OnBubbleDismiss(); } - virtual void OnLinkClicked() OVERRIDE { + virtual void OnLinkClicked() override { ++link_click_callback_count_; SuspiciousExtensionBubbleController::OnLinkClicked(); } @@ -104,17 +104,17 @@ class TestDevModeBubbleController : DevModeBubbleController(profile) { } - virtual void OnBubbleAction() OVERRIDE { + virtual void OnBubbleAction() override { ++action_button_callback_count_; DevModeBubbleController::OnBubbleAction(); } - virtual void OnBubbleDismiss() OVERRIDE { + virtual void OnBubbleDismiss() override { ++dismiss_button_callback_count_; DevModeBubbleController::OnBubbleDismiss(); } - virtual void OnLinkClicked() OVERRIDE { + virtual void OnLinkClicked() override { ++link_click_callback_count_; DevModeBubbleController::OnLinkClicked(); } @@ -128,17 +128,17 @@ class TestSettingsApiBubbleController : public SettingsApiBubbleController, SettingsApiOverrideType type) : SettingsApiBubbleController(profile, type) {} - virtual void OnBubbleAction() OVERRIDE { + virtual void OnBubbleAction() override { ++action_button_callback_count_; SettingsApiBubbleController::OnBubbleAction(); } - virtual void OnBubbleDismiss() OVERRIDE { + virtual void OnBubbleDismiss() override { ++dismiss_button_callback_count_; SettingsApiBubbleController::OnBubbleDismiss(); } - virtual void OnLinkClicked() OVERRIDE { + virtual void OnLinkClicked() override { ++link_click_callback_count_; SettingsApiBubbleController::OnLinkClicked(); } @@ -153,17 +153,17 @@ class TestNtpOverriddenBubbleController : NtpOverriddenBubbleController(profile) { } - virtual void OnBubbleAction() OVERRIDE { + virtual void OnBubbleAction() override { ++action_button_callback_count_; NtpOverriddenBubbleController::OnBubbleAction(); } - virtual void OnBubbleDismiss() OVERRIDE { + virtual void OnBubbleDismiss() override { ++dismiss_button_callback_count_; NtpOverriddenBubbleController::OnBubbleDismiss(); } - virtual void OnLinkClicked() OVERRIDE { + virtual void OnLinkClicked() override { ++link_click_callback_count_; NtpOverriddenBubbleController::OnLinkClicked(); } @@ -178,17 +178,17 @@ class TestProxyOverriddenBubbleController : ProxyOverriddenBubbleController(profile) { } - virtual void OnBubbleAction() OVERRIDE { + virtual void OnBubbleAction() override { ++action_button_callback_count_; ProxyOverriddenBubbleController::OnBubbleAction(); } - virtual void OnBubbleDismiss() OVERRIDE { + virtual void OnBubbleDismiss() override { ++dismiss_button_callback_count_; ProxyOverriddenBubbleController::OnBubbleDismiss(); } - virtual void OnLinkClicked() OVERRIDE { + virtual void OnLinkClicked() override { ++link_click_callback_count_; ProxyOverriddenBubbleController::OnLinkClicked(); } @@ -211,7 +211,7 @@ class FakeExtensionMessageBubble : public ExtensionMessageBubble { action_ = action; } - virtual void Show() OVERRIDE { + virtual void Show() override { if (action_ == BUBBLE_ACTION_CLICK_ACTION_BUTTON) action_callback_.Run(); else if (action_ == BUBBLE_ACTION_CLICK_DISMISS_BUTTON) @@ -220,15 +220,15 @@ class FakeExtensionMessageBubble : public ExtensionMessageBubble { link_callback_.Run(); } - virtual void OnActionButtonClicked(const base::Closure& callback) OVERRIDE { + virtual void OnActionButtonClicked(const base::Closure& callback) override { action_callback_ = callback; } - virtual void OnDismissButtonClicked(const base::Closure& callback) OVERRIDE { + virtual void OnDismissButtonClicked(const base::Closure& callback) override { dismiss_callback_ = callback; } - virtual void OnLinkClicked(const base::Closure& callback) OVERRIDE { + virtual void OnLinkClicked(const base::Closure& callback) override { link_callback_ = callback; } diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc index 456d85c..107d803 100644 --- a/chrome/browser/extensions/extension_messages_apitest.cc +++ b/chrome/browser/extensions/extension_messages_apitest.cc @@ -74,7 +74,7 @@ class MessageSender : public content::NotificationObserver { virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { EventRouter* event_router = EventRouter::Get(content::Source<Profile>(source).ptr()); @@ -127,7 +127,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MessagingEventURL) { // Tests connecting from a panel to its extension. class PanelMessagingTest : public ExtensionApiTest { - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnablePanels); } diff --git a/chrome/browser/extensions/extension_notification_observer.h b/chrome/browser/extensions/extension_notification_observer.h index caba786..cfd8dd9 100644 --- a/chrome/browser/extensions/extension_notification_observer.h +++ b/chrome/browser/extensions/extension_notification_observer.h @@ -53,7 +53,7 @@ class ExtensionNotificationObserver : 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; // Checks then clears notifications for our extensions. testing::AssertionResult CheckNotifications( diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index f51cd2a..5d81c1a 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -74,14 +74,14 @@ class ExtensionPrefsLastPingDay : public ExtensionPrefsTest { : extension_time_(Time::Now() - TimeDelta::FromHours(4)), blacklist_time_(Time::Now() - TimeDelta::FromHours(2)) {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { extension_id_ = prefs_.AddExtensionAndReturnId("last_ping_day"); EXPECT_TRUE(prefs()->LastPingDay(extension_id_).is_null()); prefs()->SetLastPingDay(extension_id_, extension_time_); prefs()->SetBlacklistLastPingDay(blacklist_time_); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { Time result = prefs()->LastPingDay(extension_id_); EXPECT_FALSE(result.is_null()); EXPECT_TRUE(result == extension_time_); @@ -100,7 +100,7 @@ TEST_F(ExtensionPrefsLastPingDay, LastPingDay) {} // Tests the GetToolbarOrder/SetToolbarOrder functions. class ExtensionPrefsToolbarOrder : public ExtensionPrefsTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { list_.push_back(prefs_.AddExtensionAndReturnId("1")); list_.push_back(prefs_.AddExtensionAndReturnId("2")); list_.push_back(prefs_.AddExtensionAndReturnId("3")); @@ -109,7 +109,7 @@ class ExtensionPrefsToolbarOrder : public ExtensionPrefsTest { prefs()->SetToolbarOrder(list_); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { ExtensionIdList result = prefs()->GetToolbarOrder(); ASSERT_EQ(list_, result); } @@ -122,12 +122,12 @@ TEST_F(ExtensionPrefsToolbarOrder, ToolbarOrder) {} // Tests the IsExtensionDisabled/SetExtensionState functions. class ExtensionPrefsExtensionState : public ExtensionPrefsTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { extension = prefs_.AddExtension("test"); prefs()->SetExtensionState(extension->id(), Extension::DISABLED); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { EXPECT_TRUE(prefs()->IsExtensionDisabled(extension->id())); } @@ -138,12 +138,12 @@ TEST_F(ExtensionPrefsExtensionState, ExtensionState) {} class ExtensionPrefsEscalatePermissions : public ExtensionPrefsTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { extension = prefs_.AddExtension("test"); prefs()->SetDidExtensionEscalatePermissions(extension.get(), true); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { EXPECT_TRUE(prefs()->DidExtensionEscalatePermissions(extension->id())); } @@ -155,7 +155,7 @@ TEST_F(ExtensionPrefsEscalatePermissions, EscalatePermissions) {} // Tests the AddGrantedPermissions / GetGrantedPermissions functions. class ExtensionPrefsGrantedPermissions : public ExtensionPrefsTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { const APIPermissionInfo* permission_info = PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket); @@ -276,7 +276,7 @@ class ExtensionPrefsGrantedPermissions : public ExtensionPrefsTest { EXPECT_EQ(effective_permissions_, granted_permissions->effective_hosts()); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { scoped_refptr<PermissionSet> permissions( prefs()->GetGrantedPermissions(extension_id_)); EXPECT_TRUE(permissions.get()); @@ -307,7 +307,7 @@ TEST_F(ExtensionPrefsGrantedPermissions, GrantedPermissions) {} // Tests the SetActivePermissions / GetActivePermissions functions. class ExtensionPrefsActivePermissions : public ExtensionPrefsTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { extension_id_ = prefs_.AddExtensionAndReturnId("test"); APIPermissionSet api_perms; @@ -343,7 +343,7 @@ class ExtensionPrefsActivePermissions : public ExtensionPrefsTest { EXPECT_EQ(*active_perms_.get(), *active.get()); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { scoped_refptr<PermissionSet> permissions( prefs()->GetActivePermissions(extension_id_)); EXPECT_EQ(*active_perms_.get(), *permissions.get()); @@ -358,14 +358,14 @@ TEST_F(ExtensionPrefsActivePermissions, SetAndGetActivePermissions) {} // Tests the GetVersionString function. class ExtensionPrefsVersionString : public ExtensionPrefsTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { extension = prefs_.AddExtension("test"); EXPECT_EQ("0.1", prefs()->GetVersionString(extension->id())); prefs()->OnExtensionUninstalled(extension->id(), Manifest::INTERNAL, false); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { EXPECT_EQ("", prefs()->GetVersionString(extension->id())); } @@ -376,7 +376,7 @@ TEST_F(ExtensionPrefsVersionString, VersionString) {} class ExtensionPrefsAcknowledgment : public ExtensionPrefsTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { not_installed_id_ = "pghjnghklobnfoidcldiidjjjhkeeaoi"; // Install some extensions. @@ -409,7 +409,7 @@ class ExtensionPrefsAcknowledgment : public ExtensionPrefsTest { prefs()->AcknowledgeBlacklistedExtension(not_installed_id_); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { ExtensionList::const_iterator iter; for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) { std::string id = (*iter)->id(); @@ -481,7 +481,7 @@ class ExtensionPrefsDelayedInstallInfo : public ExtensionPrefsTest { return false; } - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { PathService::Get(chrome::DIR_TEST_DATA, &basedir_); now_ = Time::Now(); id1_ = prefs_.AddExtensionAndReturnId("1"); @@ -524,7 +524,7 @@ class ExtensionPrefsDelayedInstallInfo : public ExtensionPrefsTest { prefs()->RemoveDelayedInstallInfo(id3_); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { // Make sure the info for the 3 extensions we expect is present. scoped_ptr<ExtensionPrefs::ExtensionsInfo> info( prefs()->GetAllDelayedInstallInfo()); @@ -553,7 +553,7 @@ TEST_F(ExtensionPrefsDelayedInstallInfo, DelayedInstallInfo) {} // Tests the FinishDelayedInstallInfo function. class ExtensionPrefsFinishDelayedInstallInfo : public ExtensionPrefsTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { base::DictionaryValue dictionary; dictionary.SetString(manifest_keys::kName, "test"); dictionary.SetString(manifest_keys::kVersion, "0.1"); @@ -588,7 +588,7 @@ class ExtensionPrefsFinishDelayedInstallInfo : public ExtensionPrefsTest { ASSERT_TRUE(prefs()->FinishDelayedInstallInfo(id_)); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { EXPECT_FALSE(prefs()->GetDelayedInstallInfo(id_)); EXPECT_EQ(std::string("Param"), prefs()->GetInstallParam(id_)); @@ -613,7 +613,7 @@ TEST_F(ExtensionPrefsFinishDelayedInstallInfo, FinishDelayedInstallInfo) {} class ExtensionPrefsOnExtensionInstalled : public ExtensionPrefsTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { extension_ = prefs_.AddExtension("on_extension_installed"); EXPECT_FALSE(prefs()->IsExtensionDisabled(extension_->id())); prefs()->OnExtensionInstalled(extension_.get(), @@ -622,7 +622,7 @@ class ExtensionPrefsOnExtensionInstalled : public ExtensionPrefsTest { "Param"); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { EXPECT_TRUE(prefs()->IsExtensionDisabled(extension_->id())); EXPECT_EQ(std::string("Param"), prefs()->GetInstallParam(extension_->id())); } @@ -635,7 +635,7 @@ TEST_F(ExtensionPrefsOnExtensionInstalled, class ExtensionPrefsAppDraggedByUser : public ExtensionPrefsTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { extension_ = prefs_.AddExtension("on_extension_installed"); EXPECT_FALSE(prefs()->WasAppDraggedByUser(extension_->id())); prefs()->OnExtensionInstalled(extension_.get(), @@ -644,7 +644,7 @@ class ExtensionPrefsAppDraggedByUser : public ExtensionPrefsTest { std::string()); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { // Set the flag and see if it persisted. prefs()->SetAppDraggedByUser(extension_->id()); EXPECT_TRUE(prefs()->WasAppDraggedByUser(extension_->id())); @@ -661,7 +661,7 @@ TEST_F(ExtensionPrefsAppDraggedByUser, ExtensionPrefsAppDraggedByUser) {} class ExtensionPrefsFlags : public ExtensionPrefsTest { public: - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { { base::DictionaryValue dictionary; dictionary.SetString(manifest_keys::kName, "from_webstore"); @@ -697,7 +697,7 @@ class ExtensionPrefsFlags : public ExtensionPrefsTest { } } - virtual void Verify() OVERRIDE { + virtual void Verify() override { EXPECT_TRUE(prefs()->IsFromWebStore(webstore_extension_->id())); EXPECT_FALSE(prefs()->IsFromBookmark(webstore_extension_->id())); @@ -761,13 +761,13 @@ class ExtensionPrefsBlacklistedExtensions : public ExtensionPrefsTest { public: virtual ~ExtensionPrefsBlacklistedExtensions() {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { extension_a_ = prefs_.AddExtension("a"); extension_b_ = prefs_.AddExtension("b"); extension_c_ = prefs_.AddExtension("c"); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { { ExtensionIdSet ids; EXPECT_EQ(ids, prefs()->GetBlacklistedExtensions()); @@ -841,11 +841,11 @@ class ExtensionPrefsBlacklistState : public ExtensionPrefsTest { public: virtual ~ExtensionPrefsBlacklistState() {} - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { extension_a_ = prefs_.AddExtension("a"); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { ExtensionIdSet empty_ids; EXPECT_EQ(empty_ids, prefs()->GetBlacklistedExtensions()); diff --git a/chrome/browser/extensions/extension_prefs_unittest.h b/chrome/browser/extensions/extension_prefs_unittest.h index fc0ae8e..8228d4b 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.h +++ b/chrome/browser/extensions/extension_prefs_unittest.h @@ -39,9 +39,9 @@ class ExtensionPrefsTest : public testing::Test { // This function is called to Register preference default values. virtual void RegisterPreferences(user_prefs::PrefRegistrySyncable* registry); - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; - virtual void TearDown() OVERRIDE; + virtual void TearDown() override; protected: ExtensionPrefs* prefs() { return prefs_.prefs(); } diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc index 6cca9d8..e9b3888 100644 --- a/chrome/browser/extensions/extension_protocols_unittest.cc +++ b/chrome/browser/extensions/extension_protocols_unittest.cc @@ -101,7 +101,7 @@ class ExtensionProtocolTest : public testing::Test { old_factory_(NULL), resource_context_(&test_url_request_context_) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { testing::Test::SetUp(); extension_info_map_ = new InfoMap(); net::URLRequestContext* request_context = diff --git a/chrome/browser/extensions/extension_renderer_state.cc b/chrome/browser/extensions/extension_renderer_state.cc index cf87b08..e2d33cb 100644 --- a/chrome/browser/extensions/extension_renderer_state.cc +++ b/chrome/browser/extensions/extension_renderer_state.cc @@ -39,7 +39,7 @@ class ExtensionRendererState::RenderViewHostObserver render_view_host_(host) { } - virtual void RenderViewDeleted(content::RenderViewHost* host) OVERRIDE { + virtual void RenderViewDeleted(content::RenderViewHost* host) override { if (host != render_view_host_) return; BrowserThread::PostTask( @@ -75,7 +75,7 @@ class ExtensionRendererState::TabObserver // content::NotificationObserver interface. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; content::NotificationRegistrar registrar_; }; diff --git a/chrome/browser/extensions/extension_resource_protocols.cc b/chrome/browser/extensions/extension_resource_protocols.cc index f940de6..965f3de 100644 --- a/chrome/browser/extensions/extension_resource_protocols.cc +++ b/chrome/browser/extensions/extension_resource_protocols.cc @@ -33,7 +33,7 @@ class ExtensionResourcesJob : public net::URLRequestFileJob { base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)), weak_ptr_factory_(this) {} - virtual void Start() OVERRIDE; + virtual void Start() override; protected: virtual ~ExtensionResourcesJob() {} @@ -72,7 +72,7 @@ class ExtensionResourceProtocolHandler virtual net::URLRequestJob* MaybeCreateJob( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE; + net::NetworkDelegate* network_delegate) const override; private: DISALLOW_COPY_AND_ASSIGN(ExtensionResourceProtocolHandler); diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc index 9f74df4..c2d292d 100644 --- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc +++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc @@ -17,7 +17,7 @@ class ExtensionResourceRequestPolicyTest : public ExtensionApiTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitch( extensions::switches::kAllowLegacyExtensionManifests); diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index 55954a6..4550f89 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -201,36 +201,36 @@ class ExtensionService // ExtensionServiceInterface implementation. // // NOTE: Many of these methods are DEPRECATED. See the interface for details. - virtual const extensions::ExtensionSet* extensions() const OVERRIDE; + virtual const extensions::ExtensionSet* extensions() const override; virtual extensions::PendingExtensionManager* - pending_extension_manager() OVERRIDE; + pending_extension_manager() override; virtual const extensions::Extension* GetExtensionById( - const std::string& id, bool include_disabled) const OVERRIDE; + const std::string& id, bool include_disabled) const override; virtual const extensions::Extension* GetInstalledExtension( - const std::string& id) const OVERRIDE; + const std::string& id) const override; virtual bool UpdateExtension( const std::string& id, const base::FilePath& extension_path, bool file_ownership_passed, - extensions::CrxInstaller** out_crx_installer) OVERRIDE; + extensions::CrxInstaller** out_crx_installer) override; virtual bool IsExtensionEnabled( - const std::string& extension_id) const OVERRIDE; + const std::string& extension_id) const override; virtual void UnloadExtension( const std::string& extension_id, - extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE; + extensions::UnloadedExtensionInfo::Reason reason) override; virtual void RemoveComponentExtension(const std::string& extension_id) - OVERRIDE; - virtual void AddExtension(const extensions::Extension* extension) OVERRIDE; + override; + virtual void AddExtension(const extensions::Extension* extension) override; virtual void AddComponentExtension(const extensions::Extension* extension) - OVERRIDE; + override; virtual const extensions::Extension* GetPendingExtensionUpdate( - const std::string& extension_id) const OVERRIDE; + const std::string& extension_id) const override; virtual void FinishDelayedInstallation( - const std::string& extension_id) OVERRIDE; - virtual void CheckManagementPolicy() OVERRIDE; - virtual void CheckForUpdatesSoon() OVERRIDE; - virtual bool is_ready() OVERRIDE; - virtual base::SequencedTaskRunner* GetFileTaskRunner() OVERRIDE; + const std::string& extension_id) override; + virtual void CheckManagementPolicy() override; + virtual void CheckForUpdatesSoon() override; + virtual bool is_ready() override; + virtual base::SequencedTaskRunner* GetFileTaskRunner() override; // ExternalProvider::Visitor implementation. // Exposed for testing. @@ -240,19 +240,19 @@ class ExtensionService const base::FilePath& path, extensions::Manifest::Location location, int creation_flags, - bool mark_acknowledged) OVERRIDE; + bool mark_acknowledged) override; virtual bool OnExternalExtensionUpdateUrlFound( const std::string& id, const std::string& install_parameter, const GURL& update_url, extensions::Manifest::Location location, int creation_flags, - bool mark_acknowledged) OVERRIDE; + bool mark_acknowledged) override; virtual void OnExternalProviderReady( - const extensions::ExternalProviderInterface* provider) OVERRIDE; + const extensions::ExternalProviderInterface* provider) override; // ExtensionManagement::Observer implementation: - virtual void OnExtensionManagementSettingsChanged() OVERRIDE; + virtual void OnExtensionManagementSettingsChanged() override; // Initialize and start all installed extensions. void Init(); @@ -483,10 +483,10 @@ class ExtensionService // content::NotificationObserver implementation: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // extensions::Blacklist::Observer implementation. - virtual void OnBlacklistUpdated() OVERRIDE; + virtual void OnBlacklistUpdated() override; // Similar to FinishInstallation, but first checks if there still is an update // pending for the extension, and makes sure the extension is still idle. diff --git a/chrome/browser/extensions/extension_service_test_base.h b/chrome/browser/extensions/extension_service_test_base.h index cf0785d..1f0cd4b 100644 --- a/chrome/browser/extensions/extension_service_test_base.h +++ b/chrome/browser/extensions/extension_service_test_base.h @@ -58,7 +58,7 @@ class ExtensionServiceTestBase : public testing::Test { virtual ~ExtensionServiceTestBase(); // testing::Test implementation. - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; static void SetUpTestCase(); // faux-verride (static override). // Create a set of InitParams to install an ExtensionService into |temp_dir_|. diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 9280b0a..7313ff2 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -255,7 +255,7 @@ class MockExtensionProvider : public extensions::ExternalProviderInterface { } // ExternalProvider implementation: - virtual void VisitRegisteredExtension() OVERRIDE { + virtual void VisitRegisteredExtension() override { visit_count_++; for (DataMap::const_iterator i = extension_map_.begin(); i != extension_map_.end(); ++i) { @@ -268,14 +268,14 @@ class MockExtensionProvider : public extensions::ExternalProviderInterface { visitor_->OnExternalProviderReady(this); } - virtual bool HasExtension(const std::string& id) const OVERRIDE { + virtual bool HasExtension(const std::string& id) const override { return extension_map_.find(id) != extension_map_.end(); } virtual bool GetExtensionDetails( const std::string& id, Manifest::Location* location, - scoped_ptr<Version>* version) const OVERRIDE { + scoped_ptr<Version>* version) const override { DataMap::const_iterator it = extension_map_.find(id); if (it == extension_map_.end()) return false; @@ -289,11 +289,11 @@ class MockExtensionProvider : public extensions::ExternalProviderInterface { return true; } - virtual bool IsReady() const OVERRIDE { + virtual bool IsReady() const override { return true; } - virtual void ServiceShutdown() OVERRIDE { + virtual void ServiceShutdown() override { } int visit_count() const { return visit_count_; } @@ -374,7 +374,7 @@ class MockProviderVisitor const base::FilePath& path, Manifest::Location unused, int creation_flags, - bool mark_acknowledged) OVERRIDE { + bool mark_acknowledged) override { EXPECT_EQ(expected_creation_flags_, creation_flags); ++ids_found_; @@ -418,7 +418,7 @@ class MockProviderVisitor const GURL& update_url, Manifest::Location location, int creation_flags, - bool mark_acknowledged) OVERRIDE { + bool mark_acknowledged) override { ++ids_found_; base::DictionaryValue* pref; // This tests is to make sure that the provider only notifies us of the @@ -449,7 +449,7 @@ class MockProviderVisitor } virtual void OnExternalProviderReady( - const extensions::ExternalProviderInterface* provider) OVERRIDE { + const extensions::ExternalProviderInterface* provider) override { EXPECT_EQ(provider, provider_.get()); EXPECT_TRUE(provider->IsReady()); } @@ -490,7 +490,7 @@ class ExtensionServiceTest : public extensions::ExtensionServiceTestBase, virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { switch (type) { case extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: { const Extension* extension = @@ -1155,9 +1155,9 @@ class PackExtensionTestClient : public extensions::PackExtensionJob::Client { PackExtensionTestClient(const base::FilePath& expected_crx_path, const base::FilePath& expected_private_key_path); virtual void OnPackSuccess(const base::FilePath& crx_path, - const base::FilePath& private_key_path) OVERRIDE; + const base::FilePath& private_key_path) override; virtual void OnPackFailure(const std::string& error_message, - ExtensionCreator::ErrorType type) OVERRIDE; + ExtensionCreator::ErrorType type) override; private: const base::FilePath expected_crx_path_; @@ -1466,14 +1466,14 @@ struct MockExtensionRegistryObserver const Extension* extension, bool is_update, bool from_ephemeral, - const std::string& old_name) OVERRIDE { + const std::string& old_name) override { last_extension_installed = extension->id(); } virtual void OnExtensionUninstalled( content::BrowserContext* browser_context, const Extension* extension, - extensions::UninstallReason reason) OVERRIDE { + extensions::UninstallReason reason) override { last_extension_uninstalled = extension->id(); } @@ -5134,7 +5134,7 @@ class ExtensionsReadyRecorder : public content::NotificationObserver { private: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { switch (type) { case extensions::NOTIFICATION_EXTENSIONS_READY_DEPRECATED: ready_ = true; diff --git a/chrome/browser/extensions/extension_special_storage_policy.h b/chrome/browser/extensions/extension_special_storage_policy.h index fda9be6..a7b0992 100644 --- a/chrome/browser/extensions/extension_special_storage_policy.h +++ b/chrome/browser/extensions/extension_special_storage_policy.h @@ -32,13 +32,13 @@ class ExtensionSpecialStoragePolicy : public storage::SpecialStoragePolicy { // storage::SpecialStoragePolicy methods used by storage subsystems and the // browsing data remover. These methods are safe to call on any thread. - virtual bool IsStorageProtected(const GURL& origin) OVERRIDE; - virtual bool IsStorageUnlimited(const GURL& origin) OVERRIDE; - virtual bool IsStorageSessionOnly(const GURL& origin) OVERRIDE; - virtual bool CanQueryDiskSize(const GURL& origin) OVERRIDE; - virtual bool IsFileHandler(const std::string& extension_id) OVERRIDE; - virtual bool HasIsolatedStorage(const GURL& origin) OVERRIDE; - virtual bool HasSessionOnlyOrigins() OVERRIDE; + virtual bool IsStorageProtected(const GURL& origin) override; + virtual bool IsStorageUnlimited(const GURL& origin) override; + virtual bool IsStorageSessionOnly(const GURL& origin) override; + virtual bool CanQueryDiskSize(const GURL& origin) override; + virtual bool IsFileHandler(const std::string& extension_id) override; + virtual bool HasIsolatedStorage(const GURL& origin) override; + virtual bool HasSessionOnlyOrigins() override; // Methods used by the ExtensionService to populate this class. void GrantRightsForExtension(const extensions::Extension* extension, diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc index 09984c2..579a396 100644 --- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc +++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc @@ -36,7 +36,7 @@ class ExtensionSpecialStoragePolicyTest : public testing::Test { } virtual void OnGranted(const GURL& origin, - int change_flags) OVERRIDE { + int change_flags) override { EXPECT_EQ(expected_type_, NOTIFICATION_TYPE_GRANT); EXPECT_EQ(expected_origin_, origin); EXPECT_EQ(expected_change_flags_, change_flags); @@ -44,14 +44,14 @@ class ExtensionSpecialStoragePolicyTest : public testing::Test { } virtual void OnRevoked(const GURL& origin, - int change_flags) OVERRIDE { + int change_flags) override { EXPECT_EQ(expected_type_, NOTIFICATION_TYPE_REVOKE); EXPECT_EQ(expected_origin_, origin); EXPECT_EQ(expected_change_flags_, change_flags); expected_type_ = NOTIFICATION_TYPE_NONE; } - virtual void OnCleared() OVERRIDE { + virtual void OnCleared() override { EXPECT_EQ(expected_type_, NOTIFICATION_TYPE_CLEAR); expected_type_ = NOTIFICATION_TYPE_NONE; } @@ -92,7 +92,7 @@ class ExtensionSpecialStoragePolicyTest : public testing::Test { DISALLOW_COPY_AND_ASSIGN(PolicyChangeObserver); }; - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { policy_ = new ExtensionSpecialStoragePolicy(NULL); } diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index fda41b5..3dc5763 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc @@ -50,7 +50,7 @@ class ExtensionStartupTestBase : public InProcessBrowserTest { protected: // InProcessBrowserTest - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { if (load_extensions_.empty()) { // If no |load_extensions_| were specified, allow unauthenticated // extension settings to be loaded from Preferences as if they had been @@ -74,7 +74,7 @@ class ExtensionStartupTestBase : public InProcessBrowserTest { } } - virtual bool SetUpUserDataDirectory() OVERRIDE { + virtual bool SetUpUserDataDirectory() override { base::FilePath profile_dir; PathService::Get(chrome::DIR_USER_DATA, &profile_dir); profile_dir = profile_dir.AppendASCII(TestingProfile::kTestUserProfileDir); diff --git a/chrome/browser/extensions/extension_storage_monitor.cc b/chrome/browser/extensions/extension_storage_monitor.cc index 9b85924..93f762c 100644 --- a/chrome/browser/extensions/extension_storage_monitor.cc +++ b/chrome/browser/extensions/extension_storage_monitor.cc @@ -181,7 +181,7 @@ class StorageEventObserver } // storage::StorageObserver implementation. - virtual void OnStorageEvent(const Event& event) OVERRIDE { + virtual void OnStorageEvent(const Event& event) override { OriginStorageStateMap::iterator state = origin_state_map_.find(event.filter.origin); if (state == origin_state_map_.end()) diff --git a/chrome/browser/extensions/extension_storage_monitor.h b/chrome/browser/extensions/extension_storage_monitor.h index 144c42e..3e08adc 100644 --- a/chrome/browser/extensions/extension_storage_monitor.h +++ b/chrome/browser/extensions/extension_storage_monitor.h @@ -54,29 +54,29 @@ class ExtensionStorageMonitor : public KeyedService, // content::NotificationObserver overrides: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // ExtensionRegistryObserver overrides: virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; virtual void OnExtensionWillBeInstalled( content::BrowserContext* browser_context, const Extension* extension, bool is_update, bool from_ephemeral, - const std::string& old_name) OVERRIDE; + const std::string& old_name) override; virtual void OnExtensionUninstalled( content::BrowserContext* browser_context, const Extension* extension, - extensions::UninstallReason reason) OVERRIDE; + extensions::UninstallReason reason) override; // Overridden from ExtensionUninstallDialog::Delegate: - virtual void ExtensionUninstallAccepted() OVERRIDE; - virtual void ExtensionUninstallCanceled() OVERRIDE; + virtual void ExtensionUninstallAccepted() override; + virtual void ExtensionUninstallCanceled() override; std::string GetNotificationId(const std::string& extension_id); diff --git a/chrome/browser/extensions/extension_storage_monitor_browsertest.cc b/chrome/browser/extensions/extension_storage_monitor_browsertest.cc index 3f39a81..5eff2ae 100644 --- a/chrome/browser/extensions/extension_storage_monitor_browsertest.cc +++ b/chrome/browser/extensions/extension_storage_monitor_browsertest.cc @@ -60,7 +60,7 @@ class NotificationObserver : public message_center::MessageCenterObserver { private: // MessageCenterObserver implementation: virtual void OnNotificationAdded( - const std::string& notification_id) OVERRIDE { + const std::string& notification_id) override { received_notifications_.insert(notification_id); if (waiting_ && HasReceivedNotification()) @@ -81,7 +81,7 @@ class ExtensionStorageMonitorTest : public ExtensionBrowserTest { protected: // ExtensionBrowserTest overrides: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionBrowserTest::SetUpOnMainThread(); InitStorageMonitor(); diff --git a/chrome/browser/extensions/extension_storage_monitor_factory.h b/chrome/browser/extensions/extension_storage_monitor_factory.h index 508867b..7c3a649 100644 --- a/chrome/browser/extensions/extension_storage_monitor_factory.h +++ b/chrome/browser/extensions/extension_storage_monitor_factory.h @@ -28,11 +28,11 @@ class ExtensionStorageMonitorFactory // BrowserContextKeyedServiceFactory implementation: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; }; } // namespace extensions diff --git a/chrome/browser/extensions/extension_sync_bundle.h b/chrome/browser/extensions/extension_sync_bundle.h index 64d4eb6..f9986ac 100644 --- a/chrome/browser/extensions/extension_sync_bundle.h +++ b/chrome/browser/extensions/extension_sync_bundle.h @@ -80,10 +80,10 @@ class ExtensionSyncBundle : public SyncBundle { // Overrides for SyncBundle. // Returns true if SetupSync has been called, false otherwise. - virtual bool IsSyncing() const OVERRIDE; + virtual bool IsSyncing() const override; // Sync a newly-installed extension or change an existing one. - virtual void SyncChangeIfNeeded(const Extension& extension) OVERRIDE; + virtual void SyncChangeIfNeeded(const Extension& extension) override; private: // Add a synced extension. diff --git a/chrome/browser/extensions/extension_sync_service.h b/chrome/browser/extensions/extension_sync_service.h index c5eb9d4..a351c37 100644 --- a/chrome/browser/extensions/extension_sync_service.h +++ b/chrome/browser/extensions/extension_sync_service.h @@ -62,13 +62,13 @@ class ExtensionSyncService : public syncer::SyncableService, syncer::ModelType type, const syncer::SyncDataList& initial_sync_data, scoped_ptr<syncer::SyncChangeProcessor> sync_processor, - scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE; - virtual void StopSyncing(syncer::ModelType type) OVERRIDE; + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) override; + virtual void StopSyncing(syncer::ModelType type) override; virtual syncer::SyncDataList GetAllSyncData( - syncer::ModelType type) const OVERRIDE; + syncer::ModelType type) const override; virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const syncer::SyncChangeList& change_list) OVERRIDE; + const syncer::SyncChangeList& change_list) override; // Gets the sync data for the given extension, assuming that the extension is // syncable. diff --git a/chrome/browser/extensions/extension_sync_service_factory.h b/chrome/browser/extensions/extension_sync_service_factory.h index 853c81e..bddfdc8 100644 --- a/chrome/browser/extensions/extension_sync_service_factory.h +++ b/chrome/browser/extensions/extension_sync_service_factory.h @@ -25,9 +25,9 @@ class ExtensionSyncServiceFactory : public BrowserContextKeyedServiceFactory { virtual ~ExtensionSyncServiceFactory(); virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; }; #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYNC_SERVICE_FACTORY_H_ diff --git a/chrome/browser/extensions/extension_system_factory.h b/chrome/browser/extensions/extension_system_factory.h index d775453..1e336fe 100644 --- a/chrome/browser/extensions/extension_system_factory.h +++ b/chrome/browser/extensions/extension_system_factory.h @@ -30,9 +30,9 @@ class ExtensionSystemSharedFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory implementation: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; DISALLOW_COPY_AND_ASSIGN(ExtensionSystemSharedFactory); }; @@ -43,7 +43,7 @@ class ExtensionSystemFactory : public ExtensionSystemProvider { public: // ExtensionSystem provider implementation: virtual ExtensionSystem* GetForBrowserContext( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; static ExtensionSystemFactory* GetInstance(); @@ -55,10 +55,10 @@ class ExtensionSystemFactory : public ExtensionSystemProvider { // BrowserContextKeyedServiceFactory implementation: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; DISALLOW_COPY_AND_ASSIGN(ExtensionSystemFactory); }; diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc index ca34198..e05bc6f 100644 --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc @@ -161,7 +161,7 @@ class ContentVerifierDelegateImpl : public ContentVerifierDelegate { virtual ~ContentVerifierDelegateImpl() {} - virtual Mode ShouldBeVerified(const Extension& extension) OVERRIDE { + virtual Mode ShouldBeVerified(const Extension& extension) override { #if defined(OS_CHROMEOS) if (ExtensionAssetsManagerChromeOS::IsSharedInstall(&extension)) return ContentVerifierDelegate::ENFORCE_STRICT; @@ -184,7 +184,7 @@ class ContentVerifierDelegateImpl : public ContentVerifierDelegate { return default_mode_; } - virtual const ContentVerifierKey& PublicKey() OVERRIDE { + virtual const ContentVerifierKey& PublicKey() override { static ContentVerifierKey key( extension_misc::kWebstoreSignaturesPublicKey, extension_misc::kWebstoreSignaturesPublicKeySize); @@ -192,7 +192,7 @@ class ContentVerifierDelegateImpl : public ContentVerifierDelegate { } virtual GURL GetSignatureFetchUrl(const std::string& extension_id, - const base::Version& version) OVERRIDE { + const base::Version& version) override { // TODO(asargent) Factor out common code from the extension updater's // ManifestFetchData class that can be shared for use here. std::vector<std::string> parts; @@ -211,11 +211,11 @@ class ContentVerifierDelegateImpl : public ContentVerifierDelegate { } virtual std::set<base::FilePath> GetBrowserImagePaths( - const extensions::Extension* extension) OVERRIDE { + const extensions::Extension* extension) override { return extension_file_util::GetBrowserImagePaths(extension); } - virtual void VerifyFailed(const std::string& extension_id) OVERRIDE { + virtual void VerifyFailed(const std::string& extension_id) override { if (!service_) return; ExtensionRegistry* registry = ExtensionRegistry::Get(service_->profile()); diff --git a/chrome/browser/extensions/extension_system_impl.h b/chrome/browser/extensions/extension_system_impl.h index 9a6ce20..7e8e758 100644 --- a/chrome/browser/extensions/extension_system_impl.h +++ b/chrome/browser/extensions/extension_system_impl.h @@ -32,43 +32,43 @@ class ExtensionSystemImpl : public ExtensionSystem { virtual ~ExtensionSystemImpl(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; - virtual void InitForRegularProfile(bool extensions_enabled) OVERRIDE; + virtual void InitForRegularProfile(bool extensions_enabled) override; - virtual ExtensionService* extension_service() OVERRIDE; // shared - virtual RuntimeData* runtime_data() OVERRIDE; // shared - virtual ManagementPolicy* management_policy() OVERRIDE; // shared + virtual ExtensionService* extension_service() override; // shared + virtual RuntimeData* runtime_data() override; // shared + virtual ManagementPolicy* management_policy() override; // shared // shared - virtual SharedUserScriptMaster* shared_user_script_master() OVERRIDE; - virtual ProcessManager* process_manager() OVERRIDE; - virtual StateStore* state_store() OVERRIDE; // shared - virtual StateStore* rules_store() OVERRIDE; // shared + virtual SharedUserScriptMaster* shared_user_script_master() override; + virtual ProcessManager* process_manager() override; + virtual StateStore* state_store() override; // shared + virtual StateStore* rules_store() override; // shared virtual LazyBackgroundTaskQueue* lazy_background_task_queue() - OVERRIDE; // shared - virtual InfoMap* info_map() OVERRIDE; // shared - virtual EventRouter* event_router() OVERRIDE; // shared - virtual WarningService* warning_service() OVERRIDE; - virtual Blacklist* blacklist() OVERRIDE; // shared - virtual ErrorConsole* error_console() OVERRIDE; - virtual InstallVerifier* install_verifier() OVERRIDE; - virtual QuotaService* quota_service() OVERRIDE; // shared + override; // shared + virtual InfoMap* info_map() override; // shared + virtual EventRouter* event_router() override; // shared + virtual WarningService* warning_service() override; + virtual Blacklist* blacklist() override; // shared + virtual ErrorConsole* error_console() override; + virtual InstallVerifier* install_verifier() override; + virtual QuotaService* quota_service() override; // shared virtual void RegisterExtensionWithRequestContexts( - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void UnregisterExtensionWithRequestContexts( const std::string& extension_id, - const UnloadedExtensionInfo::Reason reason) OVERRIDE; + const UnloadedExtensionInfo::Reason reason) override; - virtual const OneShotEvent& ready() const OVERRIDE; - virtual ContentVerifier* content_verifier() OVERRIDE; // shared + virtual const OneShotEvent& ready() const override; + virtual ContentVerifier* content_verifier() override; // shared virtual scoped_ptr<ExtensionSet> GetDependentExtensions( - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual DeclarativeUserScriptMaster* GetDeclarativeUserScriptMasterByExtension( - const ExtensionId& extension_id) OVERRIDE; // shared + const ExtensionId& extension_id) override; // shared private: friend class ExtensionSystemSharedFactory; @@ -87,7 +87,7 @@ class ExtensionSystemImpl : public ExtensionSystem { void Init(bool extensions_enabled); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; StateStore* state_store(); StateStore* rules_store(); diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index 48a4b34..b0fff03 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -38,7 +38,7 @@ class ExtensionApiNewTabTest : public ExtensionApiTest { public: ExtensionApiNewTabTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); // Override the default which InProcessBrowserTest adds if it doesn't see a // homepage. @@ -160,12 +160,12 @@ class ExtensionApiCaptureTest : public ExtensionApiTest { public: ExtensionApiCaptureTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EnablePixelOutput(); ExtensionApiTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); } }; diff --git a/chrome/browser/extensions/extension_test_notification_observer.cc b/chrome/browser/extensions/extension_test_notification_observer.cc index feb8c36..02b1509 100644 --- a/chrome/browser/extensions/extension_test_notification_observer.cc +++ b/chrome/browser/extensions/extension_test_notification_observer.cc @@ -67,7 +67,7 @@ class ExtensionTestNotificationObserver::NotificationSet // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; content::NotificationRegistrar notification_registrar_; base::CallbackList<void()> callback_list_; diff --git a/chrome/browser/extensions/extension_test_notification_observer.h b/chrome/browser/extensions/extension_test_notification_observer.h index 267d5f4..bdb4ea6 100644 --- a/chrome/browser/extensions/extension_test_notification_observer.h +++ b/chrome/browser/extensions/extension_test_notification_observer.h @@ -80,7 +80,7 @@ class ExtensionTestNotificationObserver // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: class NotificationSet; @@ -100,7 +100,7 @@ class ExtensionTestNotificationObserver void MaybeQuit(); // extensions::ExtensionActionAPI::Observer: - virtual void OnPageActionsUpdated(content::WebContents* contents) OVERRIDE; + virtual void OnPageActionsUpdated(content::WebContents* contents) override; Browser* browser_; Profile* profile_; diff --git a/chrome/browser/extensions/extension_toolbar_model.h b/chrome/browser/extensions/extension_toolbar_model.h index 29e83b3..b1fd01a 100644 --- a/chrome/browser/extensions/extension_toolbar_model.h +++ b/chrome/browser/extensions/extension_toolbar_model.h @@ -149,28 +149,28 @@ class ExtensionToolbarModel : public content::NotificationObserver, // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Callback when extensions are ready. void OnReady(); // ExtensionRegistryObserver: virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; virtual void OnExtensionUninstalled( content::BrowserContext* browser_context, const Extension* extension, - extensions::UninstallReason reason) OVERRIDE; + extensions::UninstallReason reason) override; // ExtensionActionAPI::Observer: virtual void OnExtensionActionUpdated( ExtensionAction* extension_action, content::WebContents* web_contents, - content::BrowserContext* browser_context) OVERRIDE; + content::BrowserContext* browser_context) override; // To be called after the extension service is ready; gets loaded extensions // from the extension service and their saved order from the pref service diff --git a/chrome/browser/extensions/extension_toolbar_model_factory.h b/chrome/browser/extensions/extension_toolbar_model_factory.h index 177eb16..16fd72e 100644 --- a/chrome/browser/extensions/extension_toolbar_model_factory.h +++ b/chrome/browser/extensions/extension_toolbar_model_factory.h @@ -28,11 +28,11 @@ class ExtensionToolbarModelFactory : public BrowserContextKeyedServiceFactory { virtual ~ExtensionToolbarModelFactory(); virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; }; } // namespace extensions diff --git a/chrome/browser/extensions/extension_toolbar_model_unittest.cc b/chrome/browser/extensions/extension_toolbar_model_unittest.cc index 8883632..71a79c0 100644 --- a/chrome/browser/extensions/extension_toolbar_model_unittest.cc +++ b/chrome/browser/extensions/extension_toolbar_model_unittest.cc @@ -59,36 +59,36 @@ class ExtensionToolbarModelTestObserver private: // ExtensionToolbarModel::Observer: virtual void ToolbarExtensionAdded(const Extension* extension, - int index) OVERRIDE { + int index) override { ++inserted_count_; } - virtual void ToolbarExtensionRemoved(const Extension* extension) OVERRIDE { + virtual void ToolbarExtensionRemoved(const Extension* extension) override { ++removed_count_; } virtual void ToolbarExtensionMoved(const Extension* extension, - int index) OVERRIDE { + int index) override { ++moved_count_; } - virtual void ToolbarExtensionUpdated(const Extension* extension) OVERRIDE { + virtual void ToolbarExtensionUpdated(const Extension* extension) override { } virtual bool ShowExtensionActionPopup(const Extension* extension, - bool grant_active_tab) OVERRIDE { + bool grant_active_tab) override { return false; } - virtual void ToolbarVisibleCountChanged() OVERRIDE { + virtual void ToolbarVisibleCountChanged() override { } - virtual void ToolbarHighlightModeChanged(bool is_highlighting) OVERRIDE { + virtual void ToolbarHighlightModeChanged(bool is_highlighting) override { // Add one if highlighting, subtract one if not. highlight_mode_count_ += is_highlighting ? 1 : -1; } - virtual Browser* GetBrowser() OVERRIDE { + virtual Browser* GetBrowser() override { return NULL; } diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc index 49446b3..b365e4f 100644 --- a/chrome/browser/extensions/extension_ui_unittest.cc +++ b/chrome/browser/extensions/extension_ui_unittest.cc @@ -44,7 +44,7 @@ class ExtensionUITest : public testing::Test { file_thread_(content::BrowserThread::FILE, &message_loop_) {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Create an ExtensionService and ManagementPolicy to inject into the // ExtensionSettingsHandler. profile_.reset(new TestingProfile()); @@ -58,7 +58,7 @@ class ExtensionUITest : public testing::Test { management_policy_)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { handler_.reset(); profile_.reset(); // Execute any pending deletion tasks. diff --git a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc index 6c96b08..ee334c2 100644 --- a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc +++ b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc @@ -26,7 +26,7 @@ using content::NavigationEntry; class ExtensionURLRewriteBrowserTest : public ExtensionBrowserTest { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { extensions::ComponentLoader::EnableBackgroundExtensionsForTesting(); ExtensionBrowserTest::SetUp(); } diff --git a/chrome/browser/extensions/extension_view_host.cc b/chrome/browser/extensions/extension_view_host.cc index 7c382a6..d3986bb 100644 --- a/chrome/browser/extensions/extension_view_host.cc +++ b/chrome/browser/extensions/extension_view_host.cc @@ -43,7 +43,7 @@ class ExtensionViewHost::AssociatedWebContentsObserver virtual ~AssociatedWebContentsObserver() {} // content::WebContentsObserver: - virtual void WebContentsDestroyed() OVERRIDE { + virtual void WebContentsDestroyed() override { // Deleting |this| from here is safe. host_->SetAssociatedWebContents(NULL); } diff --git a/chrome/browser/extensions/extension_view_host.h b/chrome/browser/extensions/extension_view_host.h index a7599b4..0ee445b 100644 --- a/chrome/browser/extensions/extension_view_host.h +++ b/chrome/browser/extensions/extension_view_host.h @@ -56,63 +56,63 @@ class ExtensionViewHost const content::NativeWebKeyboardEvent& event); // ExtensionHost - virtual void OnDidStopLoading() OVERRIDE; - virtual void OnDocumentAvailable() OVERRIDE; - virtual void LoadInitialURL() OVERRIDE; - virtual bool IsBackgroundPage() const OVERRIDE; + virtual void OnDidStopLoading() override; + virtual void OnDocumentAvailable() override; + virtual void LoadInitialURL() override; + virtual bool IsBackgroundPage() const override; // content::WebContentsDelegate virtual content::WebContents* OpenURLFromTab( content::WebContents* source, - const content::OpenURLParams& params) OVERRIDE; + const content::OpenURLParams& params) override; virtual bool PreHandleKeyboardEvent( content::WebContents* source, const content::NativeWebKeyboardEvent& event, - bool* is_keyboard_shortcut) OVERRIDE; + bool* is_keyboard_shortcut) override; virtual void HandleKeyboardEvent( content::WebContents* source, - const content::NativeWebKeyboardEvent& event) OVERRIDE; + const content::NativeWebKeyboardEvent& event) override; virtual bool PreHandleGestureEvent( content::WebContents* source, - const blink::WebGestureEvent& event) OVERRIDE; + const blink::WebGestureEvent& event) override; virtual content::ColorChooser* OpenColorChooser( content::WebContents* web_contents, SkColor color, - const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE; + const std::vector<content::ColorSuggestion>& suggestions) override; virtual void RunFileChooser( content::WebContents* tab, - const content::FileChooserParams& params) OVERRIDE; + const content::FileChooserParams& params) override; virtual void ResizeDueToAutoResize(content::WebContents* source, - const gfx::Size& new_size) OVERRIDE; + const gfx::Size& new_size) override; // content::WebContentsObserver virtual void RenderViewCreated( - content::RenderViewHost* render_view_host) OVERRIDE; + content::RenderViewHost* render_view_host) override; // web_modal::WebContentsModalDialogManagerDelegate virtual web_modal::WebContentsModalDialogHost* - GetWebContentsModalDialogHost() OVERRIDE; + GetWebContentsModalDialogHost() override; virtual bool IsWebContentsVisible( - content::WebContents* web_contents) OVERRIDE; + content::WebContents* web_contents) override; // web_modal::WebContentsModalDialogHost - virtual gfx::NativeView GetHostView() const OVERRIDE; - virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE; - virtual gfx::Size GetMaximumDialogSize() OVERRIDE; + virtual gfx::NativeView GetHostView() const override; + virtual gfx::Point GetDialogPosition(const gfx::Size& size) override; + virtual gfx::Size GetMaximumDialogSize() override; virtual void AddObserver( - web_modal::ModalDialogHostObserver* observer) OVERRIDE; + web_modal::ModalDialogHostObserver* observer) override; virtual void RemoveObserver( - web_modal::ModalDialogHostObserver* observer) OVERRIDE; + web_modal::ModalDialogHostObserver* observer) override; // extensions::ExtensionFunctionDispatcher::Delegate - virtual WindowController* GetExtensionWindowController() const OVERRIDE; - virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE; - virtual content::WebContents* GetVisibleWebContents() const OVERRIDE; + virtual WindowController* GetExtensionWindowController() const override; + virtual content::WebContents* GetAssociatedWebContents() const override; + virtual content::WebContents* GetVisibleWebContents() const override; // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: // Implemented per-platform. Create the platform-specific ExtensionView. diff --git a/chrome/browser/extensions/extension_warning_badge_service.cc b/chrome/browser/extensions/extension_warning_badge_service.cc index b34ad6b..f152d95 100644 --- a/chrome/browser/extensions/extension_warning_badge_service.cc +++ b/chrome/browser/extensions/extension_warning_badge_service.cc @@ -27,15 +27,15 @@ class ErrorBadge : public GlobalError { virtual ~ErrorBadge(); // Implementation for GlobalError: - virtual bool HasMenuItem() OVERRIDE; - virtual int MenuItemCommandID() OVERRIDE; - virtual base::string16 MenuItemLabel() OVERRIDE; - virtual void ExecuteMenuItem(Browser* browser) OVERRIDE; - - virtual bool HasBubbleView() OVERRIDE; - virtual bool HasShownBubbleView() OVERRIDE; - virtual void ShowBubbleView(Browser* browser) OVERRIDE; - virtual GlobalErrorBubbleViewBase* GetBubbleView() OVERRIDE; + virtual bool HasMenuItem() override; + virtual int MenuItemCommandID() override; + virtual base::string16 MenuItemLabel() override; + virtual void ExecuteMenuItem(Browser* browser) override; + + virtual bool HasBubbleView() override; + virtual bool HasShownBubbleView() override; + virtual void ShowBubbleView(Browser* browser) override; + virtual GlobalErrorBubbleViewBase* GetBubbleView() override; static int GetMenuItemCommandID(); diff --git a/chrome/browser/extensions/extension_warning_badge_service.h b/chrome/browser/extensions/extension_warning_badge_service.h index a000bb7..efaf2d7 100644 --- a/chrome/browser/extensions/extension_warning_badge_service.h +++ b/chrome/browser/extensions/extension_warning_badge_service.h @@ -34,7 +34,7 @@ class ExtensionWarningBadgeService : public WarningService::Observer, private: // Implementation of WarningService::Observer. - virtual void ExtensionWarningsChanged() OVERRIDE; + virtual void ExtensionWarningsChanged() override; void UpdateBadgeStatus(); virtual void ShowBadge(bool show); diff --git a/chrome/browser/extensions/extension_warning_badge_service_unittest.cc b/chrome/browser/extensions/extension_warning_badge_service_unittest.cc index 4b144d1..5ca791b 100644 --- a/chrome/browser/extensions/extension_warning_badge_service_unittest.cc +++ b/chrome/browser/extensions/extension_warning_badge_service_unittest.cc @@ -39,7 +39,7 @@ class TestExtensionWarningBadgeService : public ExtensionWarningBadgeService { virtual ~TestExtensionWarningBadgeService() {} virtual const std::set<Warning>& - GetCurrentWarnings() const OVERRIDE { + GetCurrentWarnings() const override { return warning_service_->warnings(); } diff --git a/chrome/browser/extensions/extension_web_ui_override_registrar.h b/chrome/browser/extensions/extension_web_ui_override_registrar.h index 4c3344e7..0b64887 100644 --- a/chrome/browser/extensions/extension_web_ui_override_registrar.h +++ b/chrome/browser/extensions/extension_web_ui_override_registrar.h @@ -32,11 +32,11 @@ class ExtensionWebUIOverrideRegistrar : public BrowserContextKeyedAPI, // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // BrowserContextKeyedAPI implementation. static const char* service_name() { diff --git a/chrome/browser/extensions/extension_web_ui_unittest.cc b/chrome/browser/extensions/extension_web_ui_unittest.cc index fb3bee9..ecff0e7 100644 --- a/chrome/browser/extensions/extension_web_ui_unittest.cc +++ b/chrome/browser/extensions/extension_web_ui_unittest.cc @@ -29,7 +29,7 @@ class ExtensionWebUITest : public testing::Test { : ui_thread_(content::BrowserThread::UI, &message_loop_) {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { profile_.reset(new TestingProfile()); TestExtensionSystem* system = static_cast<TestExtensionSystem*>(ExtensionSystem::Get(profile_.get())); @@ -37,7 +37,7 @@ class ExtensionWebUITest : public testing::Test { CommandLine::ForCurrentProcess(), base::FilePath(), false); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { profile_.reset(); message_loop_.RunUntilIdle(); } diff --git a/chrome/browser/extensions/extension_webui_apitest.cc b/chrome/browser/extensions/extension_webui_apitest.cc index 9177f24..16f9158 100644 --- a/chrome/browser/extensions/extension_webui_apitest.cc +++ b/chrome/browser/extensions/extension_webui_apitest.cc @@ -127,7 +127,7 @@ class ExtensionWebUITest : public ExtensionApiTest { return frame_host; } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { FeatureSwitch::ScopedOverride enable_options( FeatureSwitch::embedded_extension_options(), true); // Need to add a command line flag as well as a FeatureSwitch because the diff --git a/chrome/browser/extensions/external_component_loader.h b/chrome/browser/extensions/external_component_loader.h index a4c65f7..fe9e496 100644 --- a/chrome/browser/extensions/external_component_loader.h +++ b/chrome/browser/extensions/external_component_loader.h @@ -29,7 +29,7 @@ class ExternalComponentLoader : public ExternalLoader { static bool IsModifiable(const extensions::Extension* extension); protected: - virtual void StartLoading() OVERRIDE; + virtual void StartLoading() override; private: friend class base::RefCountedThreadSafe<ExternalLoader>; diff --git a/chrome/browser/extensions/external_install_error.cc b/chrome/browser/extensions/external_install_error.cc index d93b714..4b847b1 100644 --- a/chrome/browser/extensions/external_install_error.cc +++ b/chrome/browser/extensions/external_install_error.cc @@ -55,15 +55,15 @@ class ExternalInstallMenuAlert : public GlobalError { private: // GlobalError implementation. - virtual Severity GetSeverity() OVERRIDE; - virtual bool HasMenuItem() OVERRIDE; - virtual int MenuItemCommandID() OVERRIDE; - virtual base::string16 MenuItemLabel() OVERRIDE; - virtual void ExecuteMenuItem(Browser* browser) OVERRIDE; - virtual bool HasBubbleView() OVERRIDE; - virtual bool HasShownBubbleView() OVERRIDE; - virtual void ShowBubbleView(Browser* browser) OVERRIDE; - virtual GlobalErrorBubbleViewBase* GetBubbleView() OVERRIDE; + virtual Severity GetSeverity() override; + virtual bool HasMenuItem() override; + virtual int MenuItemCommandID() override; + virtual base::string16 MenuItemLabel() override; + virtual void ExecuteMenuItem(Browser* browser) override; + virtual bool HasBubbleView() override; + virtual bool HasShownBubbleView() override; + virtual void ShowBubbleView(Browser* browser) override; + virtual GlobalErrorBubbleViewBase* GetBubbleView() override; // The owning ExternalInstallError. ExternalInstallError* error_; @@ -80,21 +80,21 @@ class ExternalInstallBubbleAlert : public GlobalErrorWithStandardBubble { private: // GlobalError implementation. - virtual Severity GetSeverity() OVERRIDE; - virtual bool HasMenuItem() OVERRIDE; - virtual int MenuItemCommandID() OVERRIDE; - virtual base::string16 MenuItemLabel() OVERRIDE; - virtual void ExecuteMenuItem(Browser* browser) OVERRIDE; + virtual Severity GetSeverity() override; + virtual bool HasMenuItem() override; + virtual int MenuItemCommandID() override; + virtual base::string16 MenuItemLabel() override; + virtual void ExecuteMenuItem(Browser* browser) override; // GlobalErrorWithStandardBubble implementation. - virtual gfx::Image GetBubbleViewIcon() OVERRIDE; - virtual base::string16 GetBubbleViewTitle() OVERRIDE; - virtual std::vector<base::string16> GetBubbleViewMessages() OVERRIDE; - virtual base::string16 GetBubbleViewAcceptButtonLabel() OVERRIDE; - virtual base::string16 GetBubbleViewCancelButtonLabel() OVERRIDE; - virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE; - virtual void BubbleViewAcceptButtonPressed(Browser* browser) OVERRIDE; - virtual void BubbleViewCancelButtonPressed(Browser* browser) OVERRIDE; + virtual gfx::Image GetBubbleViewIcon() override; + virtual base::string16 GetBubbleViewTitle() override; + virtual std::vector<base::string16> GetBubbleViewMessages() override; + virtual base::string16 GetBubbleViewAcceptButtonLabel() override; + virtual base::string16 GetBubbleViewCancelButtonLabel() override; + virtual void OnBubbleViewDidClose(Browser* browser) override; + virtual void BubbleViewAcceptButtonPressed(Browser* browser) override; + virtual void BubbleViewCancelButtonPressed(Browser* browser) override; // The owning ExternalInstallError. ExternalInstallError* error_; diff --git a/chrome/browser/extensions/external_install_error.h b/chrome/browser/extensions/external_install_error.h index ff65e49..d56fdf5 100644 --- a/chrome/browser/extensions/external_install_error.h +++ b/chrome/browser/extensions/external_install_error.h @@ -51,8 +51,8 @@ class ExternalInstallError : public ExtensionInstallPrompt::Delegate, virtual ~ExternalInstallError(); // ExtensionInstallPrompt::Delegate implementation. - virtual void InstallUIProceed() OVERRIDE; - virtual void InstallUIAbort(bool user_initiated) OVERRIDE; + virtual void InstallUIProceed() override; + virtual void InstallUIAbort(bool user_initiated) override; // Show the associated dialog. This should only be called once the dialog is // ready. @@ -66,11 +66,11 @@ class ExternalInstallError : public ExtensionInstallPrompt::Delegate, private: // WebstoreDataFetcherDelegate implementation. - virtual void OnWebstoreRequestFailure() OVERRIDE; + virtual void OnWebstoreRequestFailure() override; virtual void OnWebstoreResponseParseSuccess( - scoped_ptr<base::DictionaryValue> webstore_data) OVERRIDE; + scoped_ptr<base::DictionaryValue> webstore_data) override; virtual void OnWebstoreResponseParseFailure( - const std::string& error) OVERRIDE; + const std::string& error) override; // Called when data fetching has completed (either successfully or not). void OnFetchComplete(); diff --git a/chrome/browser/extensions/external_install_manager.h b/chrome/browser/extensions/external_install_manager.h index 29b3fd1..b491cd3 100644 --- a/chrome/browser/extensions/external_install_manager.h +++ b/chrome/browser/extensions/external_install_manager.h @@ -57,19 +57,19 @@ class ExternalInstallManager : public ExtensionRegistryObserver, private: // ExtensionRegistryObserver implementation. 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; // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Adds a global error informing the user that an external extension was // installed. If |is_new_profile| is true, then this error is from the first diff --git a/chrome/browser/extensions/external_policy_loader.h b/chrome/browser/extensions/external_policy_loader.h index a08e9ed..b046cca 100644 --- a/chrome/browser/extensions/external_policy_loader.h +++ b/chrome/browser/extensions/external_policy_loader.h @@ -25,7 +25,7 @@ class ExternalPolicyLoader : public ExternalLoader, explicit ExternalPolicyLoader(ExtensionManagement* settings); // ExtensionManagement::Observer implementation - virtual void OnExtensionManagementSettingsChanged() OVERRIDE; + virtual void OnExtensionManagementSettingsChanged() override; // Adds an extension to be updated to the pref dictionary. static void AddExtension(base::DictionaryValue* dict, @@ -33,7 +33,7 @@ class ExternalPolicyLoader : public ExternalLoader, const std::string& update_url); protected: - virtual void StartLoading() OVERRIDE; + virtual void StartLoading() override; private: friend class base::RefCountedThreadSafe<ExternalLoader>; diff --git a/chrome/browser/extensions/external_policy_loader_unittest.cc b/chrome/browser/extensions/external_policy_loader_unittest.cc index 378148d..236358f 100644 --- a/chrome/browser/extensions/external_policy_loader_unittest.cc +++ b/chrome/browser/extensions/external_policy_loader_unittest.cc @@ -74,7 +74,7 @@ class MockExternalPolicyProviderVisitor const base::FilePath& path, Manifest::Location unused, int unused2, - bool unused3) OVERRIDE { + bool unused3) override { ADD_FAILURE() << "There should be no external extensions from files."; return false; } @@ -85,7 +85,7 @@ class MockExternalPolicyProviderVisitor const GURL& update_url, Manifest::Location location, int unused1, - bool unused2) OVERRIDE { + bool unused2) override { // Extension has the correct location. EXPECT_EQ(Manifest::EXTERNAL_POLICY_DOWNLOAD, location); @@ -102,7 +102,7 @@ class MockExternalPolicyProviderVisitor } virtual void OnExternalProviderReady( - const ExternalProviderInterface* provider) OVERRIDE { + const ExternalProviderInterface* provider) override { EXPECT_EQ(provider, provider_.get()); EXPECT_TRUE(provider->IsReady()); } diff --git a/chrome/browser/extensions/external_pref_loader.h b/chrome/browser/extensions/external_pref_loader.h index c4508c2..ec64c73 100644 --- a/chrome/browser/extensions/external_pref_loader.h +++ b/chrome/browser/extensions/external_pref_loader.h @@ -35,12 +35,12 @@ class ExternalPrefLoader : public ExternalLoader { // extension files are resolved relative to this path. ExternalPrefLoader(int base_path_id, Options options); - virtual const base::FilePath GetBaseCrxFilePath() OVERRIDE; + virtual const base::FilePath GetBaseCrxFilePath() override; protected: virtual ~ExternalPrefLoader() {} - virtual void StartLoading() OVERRIDE; + virtual void StartLoading() override; bool IsOptionSet(Options option) { return (options_ & option) != 0; } @@ -86,10 +86,10 @@ class ExternalTestingLoader : public ExternalLoader { ExternalTestingLoader(const std::string& json_data, const base::FilePath& fake_base_path); - virtual const base::FilePath GetBaseCrxFilePath() OVERRIDE; + virtual const base::FilePath GetBaseCrxFilePath() override; protected: - virtual void StartLoading() OVERRIDE; + virtual void StartLoading() override; private: friend class base::RefCountedThreadSafe<ExternalLoader>; diff --git a/chrome/browser/extensions/external_provider_impl.h b/chrome/browser/extensions/external_provider_impl.h index a0e960a..74cfadc 100644 --- a/chrome/browser/extensions/external_provider_impl.h +++ b/chrome/browser/extensions/external_provider_impl.h @@ -54,15 +54,15 @@ class ExternalProviderImpl : public ExternalProviderInterface { virtual void SetPrefs(base::DictionaryValue* prefs); // ExternalProvider implementation: - virtual void ServiceShutdown() OVERRIDE; - virtual void VisitRegisteredExtension() OVERRIDE; - virtual bool HasExtension(const std::string& id) const OVERRIDE; + virtual void ServiceShutdown() override; + virtual void VisitRegisteredExtension() override; + virtual bool HasExtension(const std::string& id) const override; virtual bool GetExtensionDetails( const std::string& id, Manifest::Location* location, - scoped_ptr<base::Version>* version) const OVERRIDE; + scoped_ptr<base::Version>* version) const override; - virtual bool IsReady() const OVERRIDE; + virtual bool IsReady() const override; static const char kExternalCrx[]; static const char kExternalVersion[]; diff --git a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc index bc90c09..235dd30 100644 --- a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc +++ b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc @@ -60,7 +60,7 @@ class ExternalProviderImplChromeOSTest : public ExtensionServiceTestBase { } // ExtensionServiceTestBase overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ExtensionServiceTestBase::SetUp(); TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_); @@ -76,7 +76,7 @@ class ExternalProviderImplChromeOSTest : public ExtensionServiceTestBase { .WillRepeatedly(Return(false)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { chromeos::KioskAppManager::Shutdown(); chromeos::system::StatisticsProvider::SetTestProvider(NULL); TestingBrowserProcess::GetGlobal()->SetLocalState(NULL); diff --git a/chrome/browser/extensions/external_provider_impl_unittest.cc b/chrome/browser/extensions/external_provider_impl_unittest.cc index 67a5d47..20d0260 100644 --- a/chrome/browser/extensions/external_provider_impl_unittest.cc +++ b/chrome/browser/extensions/external_provider_impl_unittest.cc @@ -79,7 +79,7 @@ class ExternalProviderImplTest : public ExtensionServiceTestBase { } // ExtensionServiceTestBase overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ExtensionServiceTestBase::SetUp(); test_server_.reset(new EmbeddedTestServer()); @@ -107,7 +107,7 @@ class ExternalProviderImplTest : public ExtensionServiceTestBase { #endif } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { #if defined(OS_CHROMEOS) chromeos::system::StatisticsProvider::SetTestProvider(NULL); TestingBrowserProcess::GetGlobal()->SetLocalState(NULL); diff --git a/chrome/browser/extensions/external_registry_loader_win.h b/chrome/browser/extensions/external_registry_loader_win.h index fa701b6..27526d8 100644 --- a/chrome/browser/extensions/external_registry_loader_win.h +++ b/chrome/browser/extensions/external_registry_loader_win.h @@ -15,7 +15,7 @@ class ExternalRegistryLoader : public ExternalLoader { ExternalRegistryLoader() {} protected: - virtual void StartLoading() OVERRIDE; + virtual void StartLoading() override; private: friend class base::RefCountedThreadSafe<ExternalLoader>; diff --git a/chrome/browser/extensions/fake_safe_browsing_database_manager.h b/chrome/browser/extensions/fake_safe_browsing_database_manager.h index 494a4f0..d7ff84e 100644 --- a/chrome/browser/extensions/fake_safe_browsing_database_manager.h +++ b/chrome/browser/extensions/fake_safe_browsing_database_manager.h @@ -24,7 +24,7 @@ class FakeSafeBrowsingDatabaseManager : public SafeBrowsingDatabaseManager { // IDs taken from |unsafe_ids_| are passed to to |client| on the current // message loop. virtual bool CheckExtensionIDs(const std::set<std::string>& extension_ids, - Client* client) OVERRIDE; + Client* client) override; // Return |this| to chain together SetUnsafe(...).NotifyUpdate() conveniently. FakeSafeBrowsingDatabaseManager& Enable(); diff --git a/chrome/browser/extensions/favicon_downloader.h b/chrome/browser/extensions/favicon_downloader.h index 36bf23f..e914270 100644 --- a/chrome/browser/extensions/favicon_downloader.h +++ b/chrome/browser/extensions/favicon_downloader.h @@ -67,9 +67,9 @@ class FaviconDownloader : public content::WebContentsObserver { // content::WebContentsObserver overrides: virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const content::FrameNavigateParams& params) OVERRIDE; + const content::FrameNavigateParams& params) override; virtual void DidUpdateFaviconURL( - const std::vector<content::FaviconURL>& candidates) OVERRIDE; + const std::vector<content::FaviconURL>& candidates) override; // Whether we have received favicons from the renderer. bool got_favicon_urls_; diff --git a/chrome/browser/extensions/favicon_downloader_unittest.cc b/chrome/browser/extensions/favicon_downloader_unittest.cc index 82ace4a..396466b 100644 --- a/chrome/browser/extensions/favicon_downloader_unittest.cc +++ b/chrome/browser/extensions/favicon_downloader_unittest.cc @@ -53,12 +53,12 @@ class TestFaviconDownloader : public FaviconDownloader { } virtual ~TestFaviconDownloader() {} - virtual int DownloadImage(const GURL& url) OVERRIDE { + virtual int DownloadImage(const GURL& url) override { return id_counter_++; } virtual std::vector<content::FaviconURL> GetFaviconURLsFromWebContents() - OVERRIDE { + override { return initial_favicon_urls_; } diff --git a/chrome/browser/extensions/global_shortcut_listener_chromeos.h b/chrome/browser/extensions/global_shortcut_listener_chromeos.h index a5c0641..7210645 100644 --- a/chrome/browser/extensions/global_shortcut_listener_chromeos.h +++ b/chrome/browser/extensions/global_shortcut_listener_chromeos.h @@ -22,16 +22,16 @@ class GlobalShortcutListenerChromeOS : public GlobalShortcutListener, private: // GlobalShortcutListener implementation. - virtual void StartListening() OVERRIDE; - virtual void StopListening() OVERRIDE; + virtual void StartListening() override; + virtual void StopListening() override; virtual bool RegisterAcceleratorImpl( - const ui::Accelerator& accelerator) OVERRIDE; + const ui::Accelerator& accelerator) override; virtual void UnregisterAcceleratorImpl( - const ui::Accelerator& accelerator) OVERRIDE; + const ui::Accelerator& accelerator) override; // ui::AcceleratorTarget implementation. - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; - virtual bool CanHandleAccelerators() const OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; + virtual bool CanHandleAccelerators() const override; // Whether this object is listening for global shortcuts. bool is_listening_; diff --git a/chrome/browser/extensions/global_shortcut_listener_mac.h b/chrome/browser/extensions/global_shortcut_listener_mac.h index 8ee91a1..355f3095 100644 --- a/chrome/browser/extensions/global_shortcut_listener_mac.h +++ b/chrome/browser/extensions/global_shortcut_listener_mac.h @@ -41,12 +41,12 @@ class GlobalShortcutListenerMac : public GlobalShortcutListener { bool OnMediaKeyEvent(int key_code); // GlobalShortcutListener implementation. - virtual void StartListening() OVERRIDE; - virtual void StopListening() OVERRIDE; + virtual void StartListening() override; + virtual void StopListening() override; virtual bool RegisterAcceleratorImpl( - const ui::Accelerator& accelerator) OVERRIDE; + const ui::Accelerator& accelerator) override; virtual void UnregisterAcceleratorImpl( - const ui::Accelerator& accelerator) OVERRIDE; + const ui::Accelerator& accelerator) override; // Mac-specific functions for registering hot keys with modifiers. bool RegisterHotKey(const ui::Accelerator& accelerator, KeyId hot_key_id); diff --git a/chrome/browser/extensions/global_shortcut_listener_ozone.h b/chrome/browser/extensions/global_shortcut_listener_ozone.h index 7250350..37812f9 100644 --- a/chrome/browser/extensions/global_shortcut_listener_ozone.h +++ b/chrome/browser/extensions/global_shortcut_listener_ozone.h @@ -19,12 +19,12 @@ class GlobalShortcutListenerOzone : public GlobalShortcutListener { private: // GlobalShortcutListener implementation. - virtual void StartListening() OVERRIDE; - virtual void StopListening() OVERRIDE; + virtual void StartListening() override; + virtual void StopListening() override; virtual bool RegisterAcceleratorImpl( - const ui::Accelerator& accelerator) OVERRIDE; + const ui::Accelerator& accelerator) override; virtual void UnregisterAcceleratorImpl( - const ui::Accelerator& accelerator) OVERRIDE; + const ui::Accelerator& accelerator) override; // Whether this object is listening for global shortcuts. bool is_listening_; diff --git a/chrome/browser/extensions/global_shortcut_listener_win.h b/chrome/browser/extensions/global_shortcut_listener_win.h index a192073..a155d8f 100644 --- a/chrome/browser/extensions/global_shortcut_listener_win.h +++ b/chrome/browser/extensions/global_shortcut_listener_win.h @@ -26,15 +26,15 @@ class GlobalShortcutListenerWin : public GlobalShortcutListener, virtual void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, - LPARAM lparam) OVERRIDE; + LPARAM lparam) override; // GlobalShortcutListener implementation. - virtual void StartListening() OVERRIDE; - virtual void StopListening() OVERRIDE; + virtual void StartListening() override; + virtual void StopListening() override; virtual bool RegisterAcceleratorImpl( - const ui::Accelerator& accelerator) OVERRIDE; + const ui::Accelerator& accelerator) override; virtual void UnregisterAcceleratorImpl( - const ui::Accelerator& accelerator) OVERRIDE; + const ui::Accelerator& accelerator) override; // Whether this object is listening for global shortcuts. bool is_listening_; diff --git a/chrome/browser/extensions/global_shortcut_listener_x11.h b/chrome/browser/extensions/global_shortcut_listener_x11.h index cc21ccb..8d55199 100644 --- a/chrome/browser/extensions/global_shortcut_listener_x11.h +++ b/chrome/browser/extensions/global_shortcut_listener_x11.h @@ -23,17 +23,17 @@ class GlobalShortcutListenerX11 : public GlobalShortcutListener, virtual ~GlobalShortcutListenerX11(); // ui::PlatformEventDispatcher implementation. - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; + virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override; private: // GlobalShortcutListener implementation. - virtual void StartListening() OVERRIDE; - virtual void StopListening() OVERRIDE; + virtual void StartListening() override; + virtual void StopListening() override; virtual bool RegisterAcceleratorImpl( - const ui::Accelerator& accelerator) OVERRIDE; + const ui::Accelerator& accelerator) override; virtual void UnregisterAcceleratorImpl( - const ui::Accelerator& accelerator) OVERRIDE; + const ui::Accelerator& accelerator) override; // Invoked when a global shortcut is pressed. void OnXKeyPressEvent(::XEvent* x_event); diff --git a/chrome/browser/extensions/hotword_browsertest.cc b/chrome/browser/extensions/hotword_browsertest.cc index e26a736..47bf668 100644 --- a/chrome/browser/extensions/hotword_browsertest.cc +++ b/chrome/browser/extensions/hotword_browsertest.cc @@ -29,7 +29,7 @@ class HotwordBrowserTest : public ExtensionBrowserTest { virtual ~HotwordBrowserTest() { } protected: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionBrowserTest::SetUpInProcessBrowserTestFixture(); // Force the VoiceTrigger field trial on to enable the hotword_helper @@ -46,7 +46,7 @@ class HotwordBrowserTest : 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/install_signer.cc b/chrome/browser/extensions/install_signer.cc index 643e0ff..74dc76b 100644 --- a/chrome/browser/extensions/install_signer.cc +++ b/chrome/browser/extensions/install_signer.cc @@ -277,7 +277,7 @@ class InstallSigner::FetcherDelegate : public net::URLFetcherDelegate { virtual ~FetcherDelegate() { } - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE { + virtual void OnURLFetchComplete(const net::URLFetcher* source) override { callback_.Run(); } diff --git a/chrome/browser/extensions/install_tracker.h b/chrome/browser/extensions/install_tracker.h index a1465a6..903c145 100644 --- a/chrome/browser/extensions/install_tracker.h +++ b/chrome/browser/extensions/install_tracker.h @@ -68,7 +68,7 @@ class InstallTracker : public KeyedService, // ExtensionRegistryObserver. // Overriddes for KeyedService. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; private: void OnAppsReordered(); @@ -76,12 +76,12 @@ class InstallTracker : public KeyedService, // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // ExtensionRegistryObserver implementation. virtual void OnExtensionInstalled(content::BrowserContext* browser_context, const Extension* extension, - bool is_update) OVERRIDE; + bool is_update) override; // Maps extension id to the details of an active install. typedef std::map<std::string, ActiveInstallData> ActiveInstallsMap; diff --git a/chrome/browser/extensions/install_tracker_factory.h b/chrome/browser/extensions/install_tracker_factory.h index e7e38cba..b490daf 100644 --- a/chrome/browser/extensions/install_tracker_factory.h +++ b/chrome/browser/extensions/install_tracker_factory.h @@ -26,9 +26,9 @@ class InstallTrackerFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory overrides: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; DISALLOW_COPY_AND_ASSIGN(InstallTrackerFactory); }; diff --git a/chrome/browser/extensions/install_verifier.h b/chrome/browser/extensions/install_verifier.h index 8c2a442..01fbb4f 100644 --- a/chrome/browser/extensions/install_verifier.h +++ b/chrome/browser/extensions/install_verifier.h @@ -84,10 +84,10 @@ class InstallVerifier : public ManagementPolicy::Provider { bool AllowedByEnterprisePolicy(const std::string& id) const; // ManagementPolicy::Provider interface. - virtual std::string GetDebugPolicyProviderName() const OVERRIDE; + virtual std::string GetDebugPolicyProviderName() const override; virtual bool MustRemainDisabled(const Extension* extension, Extension::DisableReason* reason, - base::string16* error) const OVERRIDE; + base::string16* error) const override; private: // We keep a list of operations to the current set of extensions. diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc index fc70dad..b6f97ed 100644 --- a/chrome/browser/extensions/isolated_app_browsertest.cc +++ b/chrome/browser/extensions/isolated_app_browsertest.cc @@ -125,7 +125,7 @@ class IsolatedAppTest : public ExtensionBrowserTest { } private: - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(base::CommandLine* command_line) override { ExtensionBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); } diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index 945fbb7..ffa3c95 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -64,7 +64,7 @@ class LoadedIncognitoObserver : public extensions::ExtensionRegistryObserver { virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE { + extensions::UnloadedExtensionInfo::Reason reason) override { original_complete_.reset(new LazyBackgroundObserver(profile_)); incognito_complete_.reset( new LazyBackgroundObserver(profile_->GetOffTheRecordProfile())); @@ -85,7 +85,7 @@ class LazyBackgroundPageApiTest : public ExtensionApiTest { LazyBackgroundPageApiTest() {} virtual ~LazyBackgroundPageApiTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); // Set shorter delays to prevent test timeouts. extensions::ProcessManager::SetEventPageIdleTimeForTesting(1); diff --git a/chrome/browser/extensions/location_bar_controller.h b/chrome/browser/extensions/location_bar_controller.h index 730b3b3..78b1bd0 100644 --- a/chrome/browser/extensions/location_bar_controller.h +++ b/chrome/browser/extensions/location_bar_controller.h @@ -39,11 +39,11 @@ class LocationBarController : public ExtensionRegistryObserver { // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded( content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // The associated WebContents. content::WebContents* web_contents_; diff --git a/chrome/browser/extensions/location_bar_controller_unittest.cc b/chrome/browser/extensions/location_bar_controller_unittest.cc index 48c2586..baa17cf 100644 --- a/chrome/browser/extensions/location_bar_controller_unittest.cc +++ b/chrome/browser/extensions/location_bar_controller_unittest.cc @@ -35,7 +35,7 @@ namespace { class LocationBarControllerUnitTest : public ChromeRenderViewHostTestHarness { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { active_script_override_.reset(new FeatureSwitch::ScopedOverride( FeatureSwitch::scripts_require_action(), true)); @@ -54,7 +54,7 @@ class LocationBarControllerUnitTest : public ChromeRenderViewHostTestHarness { &command_line, base::FilePath(), false); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { #if defined OS_CHROMEOS test_user_manager_.reset(); #endif diff --git a/chrome/browser/extensions/menu_manager.h b/chrome/browser/extensions/menu_manager.h index 25feb8f..ac1cf12 100644 --- a/chrome/browser/extensions/menu_manager.h +++ b/chrome/browser/extensions/menu_manager.h @@ -341,15 +341,15 @@ class MenuManager : 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; // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // Stores the menu items for the extension in the state storage. void WriteToStorage(const Extension* extension, diff --git a/chrome/browser/extensions/menu_manager_factory.h b/chrome/browser/extensions/menu_manager_factory.h index 7dee9b7..496d21e 100644 --- a/chrome/browser/extensions/menu_manager_factory.h +++ b/chrome/browser/extensions/menu_manager_factory.h @@ -32,11 +32,11 @@ class MenuManagerFactory : public BrowserContextKeyedServiceFactory { virtual ~MenuManagerFactory(); virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; }; } // namespace extensions diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc index 5efe9dc..f6f5ff7 100644 --- a/chrome/browser/extensions/menu_manager_unittest.cc +++ b/chrome/browser/extensions/menu_manager_unittest.cc @@ -55,7 +55,7 @@ class MenuManagerTest : public testing::Test { prefs_(message_loop_.message_loop_proxy().get()), next_id_(1) {} - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { prefs_.pref_service()->CommitPendingWrite(); message_loop_.RunUntilIdle(); } @@ -488,7 +488,7 @@ class MockExtensionSystem : public TestExtensionSystem { explicit MockExtensionSystem(Profile* profile) : TestExtensionSystem(profile) {} - virtual EventRouter* event_router() OVERRIDE { + virtual EventRouter* event_router() override { if (!mock_event_router_) mock_event_router_.reset(new MockEventRouter(profile_)); return mock_event_router_.get(); diff --git a/chrome/browser/extensions/mock_extension_special_storage_policy.h b/chrome/browser/extensions/mock_extension_special_storage_policy.h index f1b6749..673f3c9 100644 --- a/chrome/browser/extensions/mock_extension_special_storage_policy.h +++ b/chrome/browser/extensions/mock_extension_special_storage_policy.h @@ -19,12 +19,12 @@ class MockExtensionSpecialStoragePolicy : public ExtensionSpecialStoragePolicy { MockExtensionSpecialStoragePolicy(); // storage::SpecialStoragePolicy: - virtual bool IsStorageProtected(const GURL& origin) OVERRIDE; - virtual bool IsStorageUnlimited(const GURL& origin) OVERRIDE; - virtual bool IsStorageSessionOnly(const GURL& origin) OVERRIDE; - virtual bool CanQueryDiskSize(const GURL& origin) OVERRIDE; - virtual bool IsFileHandler(const std::string& extension_id) OVERRIDE; - virtual bool HasSessionOnlyOrigins() OVERRIDE; + virtual bool IsStorageProtected(const GURL& origin) override; + virtual bool IsStorageUnlimited(const GURL& origin) override; + virtual bool IsStorageSessionOnly(const GURL& origin) override; + virtual bool CanQueryDiskSize(const GURL& origin) override; + virtual bool IsFileHandler(const std::string& extension_id) override; + virtual bool HasSessionOnlyOrigins() override; void AddProtected(const GURL& origin) { protected_.insert(origin); diff --git a/chrome/browser/extensions/navigation_observer.h b/chrome/browser/extensions/navigation_observer.h index acf78ad..66686f6 100644 --- a/chrome/browser/extensions/navigation_observer.h +++ b/chrome/browser/extensions/navigation_observer.h @@ -34,7 +34,7 @@ class NavigationObserver : public ExtensionInstallPrompt::Delegate, // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: // Registers for the NOTIFICATION_NAV_ENTRY_COMMITTED notification. void RegisterForNotifications(); @@ -46,8 +46,8 @@ class NavigationObserver : public ExtensionInstallPrompt::Delegate, content::NavigationController* nav_controller); // ExtensionInstallPrompt::Delegate callbacks used for the permissions prompt. - virtual void InstallUIProceed() OVERRIDE; - virtual void InstallUIAbort(bool user_initiated) OVERRIDE; + virtual void InstallUIProceed() override; + virtual void InstallUIAbort(bool user_initiated) override; content::NotificationRegistrar registrar_; diff --git a/chrome/browser/extensions/notifications_apitest.cc b/chrome/browser/extensions/notifications_apitest.cc index 61397be..1c2c51a 100644 --- a/chrome/browser/extensions/notifications_apitest.cc +++ b/chrome/browser/extensions/notifications_apitest.cc @@ -13,7 +13,7 @@ class NotificationIdleTest : public ExtensionApiTest { protected: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); extensions::ProcessManager::SetEventPageIdleTimeForTesting(1); diff --git a/chrome/browser/extensions/ntp_overridden_bubble_controller.cc b/chrome/browser/extensions/ntp_overridden_bubble_controller.cc index 5b4b8fa..95e4eb2 100644 --- a/chrome/browser/extensions/ntp_overridden_bubble_controller.cc +++ b/chrome/browser/extensions/ntp_overridden_bubble_controller.cc @@ -30,28 +30,28 @@ class NtpOverriddenBubbleDelegate virtual ~NtpOverriddenBubbleDelegate(); // ExtensionMessageBubbleController::Delegate methods. - virtual bool ShouldIncludeExtension(const std::string& extension_id) OVERRIDE; + virtual bool ShouldIncludeExtension(const std::string& extension_id) override; virtual void AcknowledgeExtension( const std::string& extension_id, extensions::ExtensionMessageBubbleController::BubbleAction - user_action) OVERRIDE; - virtual void PerformAction(const extensions::ExtensionIdList& list) OVERRIDE; - virtual base::string16 GetTitle() const OVERRIDE; + user_action) override; + virtual void PerformAction(const extensions::ExtensionIdList& list) override; + virtual base::string16 GetTitle() const override; virtual base::string16 GetMessageBody( - bool anchored_to_browser_action) const OVERRIDE; + bool anchored_to_browser_action) const override; virtual base::string16 GetOverflowText( - const base::string16& overflow_count) const OVERRIDE; - virtual base::string16 GetLearnMoreLabel() const OVERRIDE; - virtual GURL GetLearnMoreUrl() const OVERRIDE; - virtual base::string16 GetActionButtonLabel() const OVERRIDE; - virtual base::string16 GetDismissButtonLabel() const OVERRIDE; - virtual bool ShouldShowExtensionList() const OVERRIDE; + const base::string16& overflow_count) const override; + virtual base::string16 GetLearnMoreLabel() const override; + virtual GURL GetLearnMoreUrl() const override; + virtual base::string16 GetActionButtonLabel() const override; + virtual base::string16 GetDismissButtonLabel() const override; + virtual bool ShouldShowExtensionList() const override; virtual void RestrictToSingleExtension( - const std::string& extension_id) OVERRIDE; - virtual void LogExtensionCount(size_t count) OVERRIDE; + const std::string& extension_id) override; + virtual void LogExtensionCount(size_t count) override; virtual void LogAction( extensions::ExtensionMessageBubbleController::BubbleAction - action) OVERRIDE; + action) override; private: // Our extension service. Weak, not owned by us. diff --git a/chrome/browser/extensions/ntp_overridden_bubble_controller.h b/chrome/browser/extensions/ntp_overridden_bubble_controller.h index ace01da..3a0d101 100644 --- a/chrome/browser/extensions/ntp_overridden_bubble_controller.h +++ b/chrome/browser/extensions/ntp_overridden_bubble_controller.h @@ -20,7 +20,7 @@ class NtpOverriddenBubbleController : public ExtensionMessageBubbleController { bool ShouldShow(const std::string& extension_id); // ExtensionMessageBubbleController: - virtual bool CloseOnDeactivate() OVERRIDE; + virtual bool CloseOnDeactivate() override; private: // A weak pointer to the profile we are associated with. Not owned by us. diff --git a/chrome/browser/extensions/permission_messages_unittest.cc b/chrome/browser/extensions/permission_messages_unittest.cc index 5edd3bf..71aae76 100644 --- a/chrome/browser/extensions/permission_messages_unittest.cc +++ b/chrome/browser/extensions/permission_messages_unittest.cc @@ -42,7 +42,7 @@ class PermissionMessagesUnittest : public ExtensionServiceTestBase { virtual ~PermissionMessagesUnittest() {} // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ExtensionServiceTestBase::SetUp(); InitializeExtensionService(CreateDefaultInitParams()); InitializeProcessManager(); diff --git a/chrome/browser/extensions/permissions_updater_unittest.cc b/chrome/browser/extensions/permissions_updater_unittest.cc index 63d00de..194a368 100644 --- a/chrome/browser/extensions/permissions_updater_unittest.cc +++ b/chrome/browser/extensions/permissions_updater_unittest.cc @@ -129,7 +129,7 @@ class PermissionsUpdaterListener : public content::NotificationObserver { private: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { received_notification_ = true; UpdatedExtensionPermissionsInfo* info = content::Details<UpdatedExtensionPermissionsInfo>(details).ptr(); diff --git a/chrome/browser/extensions/plugin_manager.h b/chrome/browser/extensions/plugin_manager.h index c61dd95..0d010dd 100644 --- a/chrome/browser/extensions/plugin_manager.h +++ b/chrome/browser/extensions/plugin_manager.h @@ -56,11 +56,11 @@ class PluginManager : public BrowserContextKeyedAPI, // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // BrowserContextKeyedAPI implementation. static const char* service_name() { return "PluginManager"; } diff --git a/chrome/browser/extensions/policy_handlers.h b/chrome/browser/extensions/policy_handlers.h index 7460d67..6c64f27 100644 --- a/chrome/browser/extensions/policy_handlers.h +++ b/chrome/browser/extensions/policy_handlers.h @@ -27,9 +27,9 @@ class ExtensionListPolicyHandler // ConfigurationPolicyHandler methods: virtual bool CheckPolicySettings(const policy::PolicyMap& policies, - policy::PolicyErrorMap* errors) OVERRIDE; + policy::PolicyErrorMap* errors) override; virtual void ApplyPolicySettings(const policy::PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; protected: const char* pref_path() const; @@ -54,9 +54,9 @@ class ExtensionInstallForcelistPolicyHandler // ConfigurationPolicyHandler methods: virtual bool CheckPolicySettings(const policy::PolicyMap& policies, - policy::PolicyErrorMap* errors) OVERRIDE; + policy::PolicyErrorMap* errors) override; virtual void ApplyPolicySettings(const policy::PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: // Parses the data in |policy_value| and writes them to |extension_dict|. @@ -78,9 +78,9 @@ class ExtensionURLPatternListPolicyHandler // ConfigurationPolicyHandler methods: virtual bool CheckPolicySettings(const policy::PolicyMap& policies, - policy::PolicyErrorMap* errors) OVERRIDE; + policy::PolicyErrorMap* errors) override; virtual void ApplyPolicySettings(const policy::PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: const char* pref_path_; diff --git a/chrome/browser/extensions/process_management_browsertest.cc b/chrome/browser/extensions/process_management_browsertest.cc index 7bbedd2..87d6d3e 100644 --- a/chrome/browser/extensions/process_management_browsertest.cc +++ b/chrome/browser/extensions/process_management_browsertest.cc @@ -30,7 +30,7 @@ namespace { class ProcessManagementTest : public ExtensionBrowserTest { private: // This is needed for testing isolated apps, which are still experimental. - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch( extensions::switches::kEnableExperimentalExtensionApis); diff --git a/chrome/browser/extensions/proxy_overridden_bubble_controller.cc b/chrome/browser/extensions/proxy_overridden_bubble_controller.cc index f7199d2..a634f23 100644 --- a/chrome/browser/extensions/proxy_overridden_bubble_controller.cc +++ b/chrome/browser/extensions/proxy_overridden_bubble_controller.cc @@ -34,29 +34,29 @@ class ProxyOverriddenBubbleDelegate virtual ~ProxyOverriddenBubbleDelegate(); // ExtensionMessageBubbleController::Delegate methods. - virtual bool ShouldIncludeExtension(const std::string& extension_id) OVERRIDE; + virtual bool ShouldIncludeExtension(const std::string& extension_id) override; virtual void AcknowledgeExtension( const std::string& extension_id, ExtensionMessageBubbleController::BubbleAction - user_action) OVERRIDE; - virtual void PerformAction(const ExtensionIdList& list) OVERRIDE; - virtual void OnClose() OVERRIDE; - virtual base::string16 GetTitle() const OVERRIDE; + user_action) override; + virtual void PerformAction(const ExtensionIdList& list) override; + virtual void OnClose() override; + virtual base::string16 GetTitle() const override; virtual base::string16 GetMessageBody( - bool anchored_to_browser_action) const OVERRIDE; + bool anchored_to_browser_action) const override; virtual base::string16 GetOverflowText( - const base::string16& overflow_count) const OVERRIDE; - virtual base::string16 GetLearnMoreLabel() const OVERRIDE; - virtual GURL GetLearnMoreUrl() const OVERRIDE; - virtual base::string16 GetActionButtonLabel() const OVERRIDE; - virtual base::string16 GetDismissButtonLabel() const OVERRIDE; - virtual bool ShouldShowExtensionList() const OVERRIDE; + const base::string16& overflow_count) const override; + virtual base::string16 GetLearnMoreLabel() const override; + virtual GURL GetLearnMoreUrl() const override; + virtual base::string16 GetActionButtonLabel() const override; + virtual base::string16 GetDismissButtonLabel() const override; + virtual bool ShouldShowExtensionList() const override; virtual void RestrictToSingleExtension( - const std::string& extension_id) OVERRIDE; - virtual void LogExtensionCount(size_t count) OVERRIDE; + const std::string& extension_id) override; + virtual void LogExtensionCount(size_t count) override; virtual void LogAction( ExtensionMessageBubbleController::BubbleAction - action) OVERRIDE; + action) override; private: // Our extension service. Weak, not owned by us. diff --git a/chrome/browser/extensions/proxy_overridden_bubble_controller.h b/chrome/browser/extensions/proxy_overridden_bubble_controller.h index be2e0fc..e5f6b90 100644 --- a/chrome/browser/extensions/proxy_overridden_bubble_controller.h +++ b/chrome/browser/extensions/proxy_overridden_bubble_controller.h @@ -25,7 +25,7 @@ class ProxyOverriddenBubbleController bool ShouldShow(const std::string& extension_id); // ExtensionMessageBubbleController: - virtual bool CloseOnDeactivate() OVERRIDE; + virtual bool CloseOnDeactivate() override; private: // A weak pointer to the profile we are associated with. Not owned by us. diff --git a/chrome/browser/extensions/sandboxed_unpacker.h b/chrome/browser/extensions/sandboxed_unpacker.h index 184481b..323b4c6 100644 --- a/chrome/browser/extensions/sandboxed_unpacker.h +++ b/chrome/browser/extensions/sandboxed_unpacker.h @@ -175,8 +175,8 @@ class SandboxedUnpacker : public content::UtilityProcessHostClient { void StartProcessOnIOThread(const base::FilePath& temp_crx_path); // UtilityProcessHostClient - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnProcessCrashed(int exit_code) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnProcessCrashed(int exit_code) override; // IPC message handlers. void OnUnpackExtensionSucceeded(const base::DictionaryValue& manifest); diff --git a/chrome/browser/extensions/sandboxed_unpacker_unittest.cc b/chrome/browser/extensions/sandboxed_unpacker_unittest.cc index 5ec2db9..ff01e8a 100644 --- a/chrome/browser/extensions/sandboxed_unpacker_unittest.cc +++ b/chrome/browser/extensions/sandboxed_unpacker_unittest.cc @@ -40,13 +40,13 @@ class MockSandboxedUnpackerClient : public SandboxedUnpackerClient { const base::FilePath& extension_root, const base::DictionaryValue* original_manifest, const Extension* extension, - const SkBitmap& install_icon) OVERRIDE { + const SkBitmap& install_icon) override { temp_dir_ = temp_dir; quit_closure_.Run(); } - virtual void OnUnpackFailure(const base::string16& error) OVERRIDE { + virtual void OnUnpackFailure(const base::string16& error) override { ASSERT_TRUE(false); } diff --git a/chrome/browser/extensions/settings_api_bubble_controller.cc b/chrome/browser/extensions/settings_api_bubble_controller.cc index 7cf541c..f5c553f 100644 --- a/chrome/browser/extensions/settings_api_bubble_controller.cc +++ b/chrome/browser/extensions/settings_api_bubble_controller.cc @@ -36,25 +36,25 @@ class SettingsApiBubbleDelegate virtual ~SettingsApiBubbleDelegate(); // ExtensionMessageBubbleController::Delegate methods. - virtual bool ShouldIncludeExtension(const std::string& extension_id) OVERRIDE; + virtual bool ShouldIncludeExtension(const std::string& extension_id) override; virtual void AcknowledgeExtension( const std::string& extension_id, - ExtensionMessageBubbleController::BubbleAction user_action) OVERRIDE; - virtual void PerformAction(const ExtensionIdList& list) OVERRIDE; - virtual void OnClose() OVERRIDE; - virtual base::string16 GetTitle() const OVERRIDE; + ExtensionMessageBubbleController::BubbleAction user_action) override; + virtual void PerformAction(const ExtensionIdList& list) override; + virtual void OnClose() override; + virtual base::string16 GetTitle() const override; virtual base::string16 GetMessageBody( - bool anchored_to_browser_action) const OVERRIDE; + bool anchored_to_browser_action) const override; virtual base::string16 GetOverflowText( - const base::string16& overflow_count) const OVERRIDE; - virtual base::string16 GetLearnMoreLabel() const OVERRIDE; - virtual GURL GetLearnMoreUrl() const OVERRIDE; - virtual base::string16 GetActionButtonLabel() const OVERRIDE; - virtual base::string16 GetDismissButtonLabel() const OVERRIDE; - virtual bool ShouldShowExtensionList() const OVERRIDE; - virtual void LogExtensionCount(size_t count) OVERRIDE; + const base::string16& overflow_count) const override; + virtual base::string16 GetLearnMoreLabel() const override; + virtual GURL GetLearnMoreUrl() const override; + virtual base::string16 GetActionButtonLabel() const override; + virtual base::string16 GetDismissButtonLabel() const override; + virtual bool ShouldShowExtensionList() const override; + virtual void LogExtensionCount(size_t count) override; virtual void LogAction( - ExtensionMessageBubbleController::BubbleAction action) OVERRIDE; + ExtensionMessageBubbleController::BubbleAction action) override; private: // Our extension service. Weak, not owned by us. diff --git a/chrome/browser/extensions/settings_api_bubble_controller.h b/chrome/browser/extensions/settings_api_bubble_controller.h index 2a65641..0c9c494 100644 --- a/chrome/browser/extensions/settings_api_bubble_controller.h +++ b/chrome/browser/extensions/settings_api_bubble_controller.h @@ -23,7 +23,7 @@ class SettingsApiBubbleController : public ExtensionMessageBubbleController { bool ShouldShow(const std::string& extension_id); // ExtensionMessageBubbleController: - virtual bool CloseOnDeactivate() OVERRIDE; + virtual bool CloseOnDeactivate() override; private: // A weak pointer to the profile we are associated with. Not owned by us. diff --git a/chrome/browser/extensions/shared_module_service.h b/chrome/browser/extensions/shared_module_service.h index 9859e34..94b1f44 100644 --- a/chrome/browser/extensions/shared_module_service.h +++ b/chrome/browser/extensions/shared_module_service.h @@ -61,11 +61,11 @@ class SharedModuleService : public ExtensionRegistryObserver { // ExtensionRegistryObserver implementation. 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; ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> extension_registry_observer_; diff --git a/chrome/browser/extensions/shared_module_service_unittest.cc b/chrome/browser/extensions/shared_module_service_unittest.cc index 1a8a2f2..c0866c1 100644 --- a/chrome/browser/extensions/shared_module_service_unittest.cc +++ b/chrome/browser/extensions/shared_module_service_unittest.cc @@ -54,7 +54,7 @@ class SharedModuleServiceUnitTest : public ExtensionServiceTestBase { // run as stable channel on the official Windows build. current_channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {} protected: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; // Install an extension and notify the ExtensionService. testing::AssertionResult InstallExtension(const Extension* extension, diff --git a/chrome/browser/extensions/shared_user_script_master.h b/chrome/browser/extensions/shared_user_script_master.h index 3658525..43b99aa 100644 --- a/chrome/browser/extensions/shared_user_script_master.h +++ b/chrome/browser/extensions/shared_user_script_master.h @@ -37,11 +37,11 @@ class SharedUserScriptMaster : public ExtensionRegistryObserver { private: // ExtensionRegistryObserver implementation. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // Gets an extension's scripts' metadata; i.e., gets a list of UserScript // objects that contains script info, but not the contents of the scripts. diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.h b/chrome/browser/extensions/signin/gaia_auth_extension_loader.h index e1f10f4..788e70c 100644 --- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.h +++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.h @@ -39,7 +39,7 @@ class GaiaAuthExtensionLoader : public BrowserContextKeyedAPI { friend class BrowserContextKeyedAPIFactory<GaiaAuthExtensionLoader>; // KeyedService overrides: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // BrowserContextKeyedAPI implementation. static const char* service_name() { diff --git a/chrome/browser/extensions/standard_management_policy_provider.h b/chrome/browser/extensions/standard_management_policy_provider.h index 7b6ed85..bceb897 100644 --- a/chrome/browser/extensions/standard_management_policy_provider.h +++ b/chrome/browser/extensions/standard_management_policy_provider.h @@ -23,13 +23,13 @@ class StandardManagementPolicyProvider : public ManagementPolicy::Provider { virtual ~StandardManagementPolicyProvider(); // ManagementPolicy::Provider implementation. - virtual std::string GetDebugPolicyProviderName() const OVERRIDE; + virtual std::string GetDebugPolicyProviderName() const override; virtual bool UserMayLoad(const Extension* extension, - base::string16* error) const OVERRIDE; + base::string16* error) const override; virtual bool UserMayModifySettings(const Extension* extension, - base::string16* error) const OVERRIDE; + base::string16* error) const override; virtual bool MustRemainEnabled(const Extension* extension, - base::string16* error) const OVERRIDE; + base::string16* error) const override; private: const ExtensionManagement* settings_; diff --git a/chrome/browser/extensions/startup_helper.cc b/chrome/browser/extensions/startup_helper.cc index 36f427c..e9b33cb 100644 --- a/chrome/browser/extensions/startup_helper.cc +++ b/chrome/browser/extensions/startup_helper.cc @@ -144,7 +144,7 @@ class ValidateCrxHelper : public SandboxedUnpackerClient { const base::FilePath& extension_root, const base::DictionaryValue* original_manifest, const Extension* extension, - const SkBitmap& install_icon) OVERRIDE { + const SkBitmap& install_icon) override { finished_ = true; success_ = true; BrowserThread::PostTask(BrowserThread::UI, @@ -153,7 +153,7 @@ class ValidateCrxHelper : public SandboxedUnpackerClient { this)); } - virtual void OnUnpackFailure(const base::string16& error) OVERRIDE { + virtual void OnUnpackFailure(const base::string16& error) override { finished_ = true; success_ = false; error_ = error; diff --git a/chrome/browser/extensions/startup_helper.h b/chrome/browser/extensions/startup_helper.h index 3bb2fd8..d6d36b4 100644 --- a/chrome/browser/extensions/startup_helper.h +++ b/chrome/browser/extensions/startup_helper.h @@ -24,9 +24,9 @@ class StartupHelper : public PackExtensionJob::Client { virtual void OnPackSuccess( const base::FilePath& crx_path, - const base::FilePath& output_private_key_path) OVERRIDE; + const base::FilePath& output_private_key_path) override; virtual void OnPackFailure(const std::string& error_message, - ExtensionCreator::ErrorType type) OVERRIDE; + ExtensionCreator::ErrorType type) override; // Handle --pack-extension flag from the |cmd_line| by packing the specified // extension. Returns false if the pack job failed. diff --git a/chrome/browser/extensions/startup_helper_browsertest.cc b/chrome/browser/extensions/startup_helper_browsertest.cc index 49a3db5..22f71b1 100644 --- a/chrome/browser/extensions/startup_helper_browsertest.cc +++ b/chrome/browser/extensions/startup_helper_browsertest.cc @@ -17,7 +17,7 @@ class StartupHelperBrowserTest : public InProcessBrowserTest { StartupHelperBrowserTest() {} virtual ~StartupHelperBrowserTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kNoStartupWindow); PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); test_data_dir_ = test_data_dir_.AppendASCII("extensions"); diff --git a/chrome/browser/extensions/state_store_notification_observer.h b/chrome/browser/extensions/state_store_notification_observer.h index 19a9965..0266e59 100644 --- a/chrome/browser/extensions/state_store_notification_observer.h +++ b/chrome/browser/extensions/state_store_notification_observer.h @@ -24,7 +24,7 @@ class StateStoreNotificationObserver : public content::NotificationObserver { // content::NotificationObserver overrides: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: StateStore* state_store_; // Not owned. diff --git a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc index 668221f..8a65721 100644 --- a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc +++ b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc @@ -37,24 +37,24 @@ class SuspiciousExtensionBubbleDelegate virtual ~SuspiciousExtensionBubbleDelegate(); // ExtensionMessageBubbleController::Delegate methods. - virtual bool ShouldIncludeExtension(const std::string& extension_id) OVERRIDE; + virtual bool ShouldIncludeExtension(const std::string& extension_id) override; virtual void AcknowledgeExtension( const std::string& extension_id, - ExtensionMessageBubbleController::BubbleAction user_action) OVERRIDE; - virtual void PerformAction(const extensions::ExtensionIdList& list) OVERRIDE; - virtual base::string16 GetTitle() const OVERRIDE; + ExtensionMessageBubbleController::BubbleAction user_action) override; + virtual void PerformAction(const extensions::ExtensionIdList& list) override; + virtual base::string16 GetTitle() const override; virtual base::string16 GetMessageBody( - bool anchored_to_browser_action) const OVERRIDE; + bool anchored_to_browser_action) const override; virtual base::string16 GetOverflowText( - const base::string16& overflow_count) const OVERRIDE; - virtual base::string16 GetLearnMoreLabel() const OVERRIDE; - virtual GURL GetLearnMoreUrl() const OVERRIDE; - virtual base::string16 GetActionButtonLabel() const OVERRIDE; - virtual base::string16 GetDismissButtonLabel() const OVERRIDE; - virtual bool ShouldShowExtensionList() const OVERRIDE; - virtual void LogExtensionCount(size_t count) OVERRIDE; + const base::string16& overflow_count) const override; + virtual base::string16 GetLearnMoreLabel() const override; + virtual GURL GetLearnMoreUrl() const override; + virtual base::string16 GetActionButtonLabel() const override; + virtual base::string16 GetDismissButtonLabel() const override; + virtual bool ShouldShowExtensionList() const override; + virtual void LogExtensionCount(size_t count) override; virtual void LogAction( - ExtensionMessageBubbleController::BubbleAction action) OVERRIDE; + ExtensionMessageBubbleController::BubbleAction action) override; private: // Our profile. Weak, not owned by us. diff --git a/chrome/browser/extensions/suspicious_extension_bubble_controller.h b/chrome/browser/extensions/suspicious_extension_bubble_controller.h index 450695a..b13802b 100644 --- a/chrome/browser/extensions/suspicious_extension_bubble_controller.h +++ b/chrome/browser/extensions/suspicious_extension_bubble_controller.h @@ -28,7 +28,7 @@ class SuspiciousExtensionBubbleController bool ShouldShow(); // ExtensionMessageBubbleController methods. - virtual void Show(ExtensionMessageBubble* bubble) OVERRIDE; + virtual void Show(ExtensionMessageBubble* bubble) override; private: // A weak pointer to the profile we are associated with. Not owned by us. diff --git a/chrome/browser/extensions/tab_helper.h b/chrome/browser/extensions/tab_helper.h index e9009cc..0c2772b 100644 --- a/chrome/browser/extensions/tab_helper.h +++ b/chrome/browser/extensions/tab_helper.h @@ -142,22 +142,22 @@ class TabHelper : public content::WebContentsObserver, // content::WebContentsObserver overrides. virtual void RenderViewCreated( - content::RenderViewHost* render_view_host) OVERRIDE; + content::RenderViewHost* render_view_host) override; virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const content::FrameNavigateParams& params) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + const content::FrameNavigateParams& params) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; virtual bool OnMessageReceived( const IPC::Message& message, - content::RenderFrameHost* render_frame_host) OVERRIDE; + content::RenderFrameHost* render_frame_host) override; virtual void DidCloneToNewWebContents( content::WebContents* old_web_contents, - content::WebContents* new_web_contents) OVERRIDE; + content::WebContents* new_web_contents) override; // extensions::ExtensionFunctionDispatcher::Delegate overrides. virtual extensions::WindowController* GetExtensionWindowController() - const OVERRIDE; - virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE; + const override; + virtual content::WebContents* GetAssociatedWebContents() const override; // Message handlers. void OnDidGetWebApplicationInfo(const WebApplicationInfo& info); @@ -199,7 +199,7 @@ class TabHelper : public content::WebContentsObserver, // content::NotificationObserver. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Requests application info for the specified page. This is an asynchronous // request. The delegate is notified by way of OnDidGetApplicationInfo when diff --git a/chrome/browser/extensions/test_blacklist.h b/chrome/browser/extensions/test_blacklist.h index ea10bc4..4b044b7 100644 --- a/chrome/browser/extensions/test_blacklist.h +++ b/chrome/browser/extensions/test_blacklist.h @@ -24,7 +24,7 @@ class BlacklistStateFetcherMock : public BlacklistStateFetcher { virtual ~BlacklistStateFetcherMock(); virtual void Request(const std::string& id, - const RequestCallback& callback) OVERRIDE; + const RequestCallback& callback) override; void SetState(const std::string& id, BlacklistState state); diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index 51e5557..adb62ea 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -47,7 +47,7 @@ class IncrementalTimeProvider : public ExtensionPrefs::TimeProvider { virtual ~IncrementalTimeProvider() { } - virtual base::Time GetCurrentTime() const OVERRIDE { + virtual base::Time GetCurrentTime() const override { current_time_ += base::TimeDelta::FromSeconds(10); return current_time_; } diff --git a/chrome/browser/extensions/test_extension_service.h b/chrome/browser/extensions/test_extension_service.h index a68fe85..5ee31f7 100644 --- a/chrome/browser/extensions/test_extension_service.h +++ b/chrome/browser/extensions/test_extension_service.h @@ -23,42 +23,42 @@ class TestExtensionService : public ExtensionServiceInterface { virtual ~TestExtensionService(); // ExtensionServiceInterface implementation. - virtual const extensions::ExtensionSet* extensions() const OVERRIDE; + virtual const extensions::ExtensionSet* extensions() const override; virtual extensions::PendingExtensionManager* - pending_extension_manager() OVERRIDE; + pending_extension_manager() override; virtual bool UpdateExtension( const std::string& id, const base::FilePath& path, bool file_ownership_passed, - extensions::CrxInstaller** out_crx_installer) OVERRIDE; + extensions::CrxInstaller** out_crx_installer) override; virtual const extensions::Extension* GetExtensionById( - const std::string& id, bool include_disabled) const OVERRIDE; + const std::string& id, bool include_disabled) const override; virtual const extensions::Extension* GetInstalledExtension( - const std::string& id) const OVERRIDE; + const std::string& id) const override; virtual const extensions::Extension* GetPendingExtensionUpdate( - const std::string& extension_id) const OVERRIDE; + const std::string& extension_id) const override; virtual void FinishDelayedInstallation( - const std::string& extension_id) OVERRIDE; + const std::string& extension_id) override; virtual bool IsExtensionEnabled( - const std::string& extension_id) const OVERRIDE; + const std::string& extension_id) const override; - virtual void CheckManagementPolicy() OVERRIDE; - virtual void CheckForUpdatesSoon() OVERRIDE; + virtual void CheckManagementPolicy() override; + virtual void CheckForUpdatesSoon() override; - virtual bool is_ready() OVERRIDE; + virtual bool is_ready() override; - virtual base::SequencedTaskRunner* GetFileTaskRunner() OVERRIDE; + virtual base::SequencedTaskRunner* GetFileTaskRunner() override; - virtual void AddExtension(const extensions::Extension* extension) OVERRIDE; + virtual void AddExtension(const extensions::Extension* extension) override; virtual void AddComponentExtension( - const extensions::Extension* extension) OVERRIDE; + const extensions::Extension* extension) override; virtual void UnloadExtension( const std::string& extension_id, - extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE; + extensions::UnloadedExtensionInfo::Reason reason) override; virtual void RemoveComponentExtension(const std::string & extension_id) - OVERRIDE; + override; }; #endif // CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_SERVICE_H_ diff --git a/chrome/browser/extensions/test_extension_system.h b/chrome/browser/extensions/test_extension_system.h index 53d4c04..4a06463 100644 --- a/chrome/browser/extensions/test_extension_system.h +++ b/chrome/browser/extensions/test_extension_system.h @@ -36,7 +36,7 @@ class TestExtensionSystem : public ExtensionSystem { virtual ~TestExtensionSystem(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // Creates an ExtensionPrefs with the testing profile and returns it. // Useful for tests that need to modify prefs before creating the @@ -60,32 +60,32 @@ class TestExtensionSystem : public ExtensionSystem { void CreateSocketManager(); - virtual void InitForRegularProfile(bool extensions_enabled) OVERRIDE {} + virtual void InitForRegularProfile(bool extensions_enabled) override {} void SetExtensionService(ExtensionService* service); - virtual ExtensionService* extension_service() OVERRIDE; - virtual RuntimeData* runtime_data() OVERRIDE; - virtual ManagementPolicy* management_policy() OVERRIDE; - virtual SharedUserScriptMaster* shared_user_script_master() OVERRIDE; - virtual ProcessManager* process_manager() OVERRIDE; - virtual StateStore* state_store() OVERRIDE; - virtual StateStore* rules_store() OVERRIDE; + virtual ExtensionService* extension_service() override; + virtual RuntimeData* runtime_data() override; + virtual ManagementPolicy* management_policy() override; + virtual SharedUserScriptMaster* shared_user_script_master() override; + virtual ProcessManager* process_manager() override; + virtual StateStore* state_store() override; + virtual StateStore* rules_store() override; TestingValueStore* value_store() { return value_store_; } - virtual InfoMap* info_map() OVERRIDE; - virtual LazyBackgroundTaskQueue* lazy_background_task_queue() OVERRIDE; + virtual InfoMap* info_map() override; + virtual LazyBackgroundTaskQueue* lazy_background_task_queue() override; void SetEventRouter(scoped_ptr<EventRouter> event_router); - virtual EventRouter* event_router() OVERRIDE; - virtual WarningService* warning_service() OVERRIDE; - virtual Blacklist* blacklist() OVERRIDE; - virtual ErrorConsole* error_console() OVERRIDE; - virtual InstallVerifier* install_verifier() OVERRIDE; - virtual QuotaService* quota_service() OVERRIDE; - virtual const OneShotEvent& ready() const OVERRIDE; - virtual ContentVerifier* content_verifier() OVERRIDE; + virtual EventRouter* event_router() override; + virtual WarningService* warning_service() override; + virtual Blacklist* blacklist() override; + virtual ErrorConsole* error_console() override; + virtual InstallVerifier* install_verifier() override; + virtual QuotaService* quota_service() override; + virtual const OneShotEvent& ready() const override; + virtual ContentVerifier* content_verifier() override; virtual scoped_ptr<ExtensionSet> GetDependentExtensions( - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual DeclarativeUserScriptMaster* GetDeclarativeUserScriptMasterByExtension( - const ExtensionId& extension_id) OVERRIDE; + const ExtensionId& extension_id) override; // Note that you probably want to use base::RunLoop().RunUntilIdle() right // after this to run all the accumulated tasks. diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.h b/chrome/browser/extensions/theme_installed_infobar_delegate.h index 3a44a5e..499a2eb 100644 --- a/chrome/browser/extensions/theme_installed_infobar_delegate.h +++ b/chrome/browser/extensions/theme_installed_infobar_delegate.h @@ -42,19 +42,19 @@ class ThemeInstalledInfoBarDelegate : public ConfirmInfoBarDelegate, virtual ~ThemeInstalledInfoBarDelegate(); // ConfirmInfoBarDelegate: - virtual int GetIconID() const OVERRIDE; - virtual Type GetInfoBarType() const OVERRIDE; + virtual int GetIconID() const override; + virtual Type GetInfoBarType() const override; virtual ThemeInstalledInfoBarDelegate* - AsThemePreviewInfobarDelegate() OVERRIDE; - virtual base::string16 GetMessageText() const OVERRIDE; - virtual int GetButtons() const OVERRIDE; - virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; - virtual bool Cancel() OVERRIDE; + AsThemePreviewInfobarDelegate() override; + virtual base::string16 GetMessageText() const override; + virtual int GetButtons() const override; + virtual base::string16 GetButtonLabel(InfoBarButton button) const override; + virtual bool Cancel() override; // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; ExtensionService* extension_service_; ThemeService* theme_service_; diff --git a/chrome/browser/extensions/token_cache/token_cache_service.h b/chrome/browser/extensions/token_cache/token_cache_service.h index a533bba..c90e74a 100644 --- a/chrome/browser/extensions/token_cache/token_cache_service.h +++ b/chrome/browser/extensions/token_cache/token_cache_service.h @@ -39,7 +39,7 @@ class TokenCacheService : public KeyedService, std::string RetrieveToken(const std::string& token_name); // KeyedService: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; private: friend class TokenCacheTest; @@ -47,7 +47,7 @@ class TokenCacheService : public KeyedService, // SigninManagerBase::Observer: virtual void GoogleSignedOut(const std::string& account_id, - const std::string& username) OVERRIDE; + const std::string& username) override; struct TokenCacheData { std::string token; diff --git a/chrome/browser/extensions/token_cache/token_cache_service_factory.h b/chrome/browser/extensions/token_cache/token_cache_service_factory.h index 14eff8c..151047a 100644 --- a/chrome/browser/extensions/token_cache/token_cache_service_factory.h +++ b/chrome/browser/extensions/token_cache/token_cache_service_factory.h @@ -28,7 +28,7 @@ class TokenCacheServiceFactory : public BrowserContextKeyedServiceFactory { // Inherited from BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; DISALLOW_COPY_AND_ASSIGN(TokenCacheServiceFactory); }; diff --git a/chrome/browser/extensions/unpacked_installer.cc b/chrome/browser/extensions/unpacked_installer.cc index 3176fb9..e11a1fe 100644 --- a/chrome/browser/extensions/unpacked_installer.cc +++ b/chrome/browser/extensions/unpacked_installer.cc @@ -54,8 +54,8 @@ class SimpleExtensionLoadPrompt : public ExtensionInstallPrompt::Delegate { void ShowPrompt(); // ExtensionInstallUI::Delegate - virtual void InstallUIProceed() OVERRIDE; - virtual void InstallUIAbort(bool user_initiated) OVERRIDE; + virtual void InstallUIProceed() override; + virtual void InstallUIAbort(bool user_initiated) override; private: scoped_ptr<ExtensionInstallPrompt> install_ui_; diff --git a/chrome/browser/extensions/updater/extension_cache.cc b/chrome/browser/extensions/updater/extension_cache.cc index 7889969..c9111c7 100644 --- a/chrome/browser/extensions/updater/extension_cache.cc +++ b/chrome/browser/extensions/updater/extension_cache.cc @@ -24,27 +24,27 @@ class ExtensionCacheNullImpl : public ExtensionCache { } // Implementation of ExtensionCache. - virtual void Start(const base::Closure& callback) OVERRIDE { + virtual void Start(const base::Closure& callback) override { callback.Run(); } - virtual void Shutdown(const base::Closure& callback) OVERRIDE { + virtual void Shutdown(const base::Closure& callback) override { callback.Run(); } - virtual void AllowCaching(const std::string& id) OVERRIDE { + virtual void AllowCaching(const std::string& id) override { } virtual bool GetExtension(const std::string& id, base::FilePath* file_path, - std::string* version) OVERRIDE { + std::string* version) override { return false; } virtual void PutExtension(const std::string& id, const base::FilePath& file_path, const std::string& version, - const PutExtensionCallback& callback) OVERRIDE { + const PutExtensionCallback& callback) override { callback.Run(file_path, true); } diff --git a/chrome/browser/extensions/updater/extension_cache_fake.h b/chrome/browser/extensions/updater/extension_cache_fake.h index 2c9b3ca..6a6869a 100644 --- a/chrome/browser/extensions/updater/extension_cache_fake.h +++ b/chrome/browser/extensions/updater/extension_cache_fake.h @@ -20,16 +20,16 @@ class ExtensionCacheFake : public ExtensionCache { virtual ~ExtensionCacheFake(); // Implementation of ExtensionCache. - virtual void Start(const base::Closure& callback) OVERRIDE; - virtual void Shutdown(const base::Closure& callback) OVERRIDE; - virtual void AllowCaching(const std::string& id) OVERRIDE; + virtual void Start(const base::Closure& callback) override; + virtual void Shutdown(const base::Closure& callback) override; + virtual void AllowCaching(const std::string& id) override; virtual bool GetExtension(const std::string& id, base::FilePath* file_path, - std::string* version) OVERRIDE; + std::string* version) override; virtual void PutExtension(const std::string& id, const base::FilePath& file_path, const std::string& version, - const PutExtensionCallback& callback) OVERRIDE; + const PutExtensionCallback& callback) override; private: typedef std::map<std::string, std::pair<std::string, base::FilePath> > Map; diff --git a/chrome/browser/extensions/updater/extension_cache_impl.h b/chrome/browser/extensions/updater/extension_cache_impl.h index a1223ee..444d455 100644 --- a/chrome/browser/extensions/updater/extension_cache_impl.h +++ b/chrome/browser/extensions/updater/extension_cache_impl.h @@ -31,21 +31,21 @@ class ExtensionCacheImpl : public ExtensionCache, static ExtensionCacheImpl* GetInstance(); // Implementation of ExtensionCache. - virtual void Start(const base::Closure& callback) OVERRIDE; - virtual void Shutdown(const base::Closure& callback) OVERRIDE; - virtual void AllowCaching(const std::string& id) OVERRIDE; + virtual void Start(const base::Closure& callback) override; + virtual void Shutdown(const base::Closure& callback) override; + virtual void AllowCaching(const std::string& id) override; virtual bool GetExtension(const std::string& id, base::FilePath* file_path, - std::string* version) OVERRIDE; + std::string* version) override; virtual void PutExtension(const std::string& id, const base::FilePath& file_path, const std::string& version, - const PutExtensionCallback& callback) OVERRIDE; + const PutExtensionCallback& callback) override; // Implementation of content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: friend struct DefaultSingletonTraits<ExtensionCacheImpl>; diff --git a/chrome/browser/extensions/updater/extension_downloader.h b/chrome/browser/extensions/updater/extension_downloader.h index 34b6a97..3e679fe 100644 --- a/chrome/browser/extensions/updater/extension_downloader.h +++ b/chrome/browser/extensions/updater/extension_downloader.h @@ -196,7 +196,7 @@ class ExtensionDownloader void CreateManifestFetcher(); // net::URLFetcherDelegate implementation. - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; // Handles the result of a manifest fetch. void OnManifestFetchComplete(const GURL& url, @@ -258,9 +258,9 @@ class ExtensionDownloader // OAuth2TokenService::Consumer implementation. virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request, const std::string& access_token, - const base::Time& expiration_time) OVERRIDE; + const base::Time& expiration_time) override; virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request, - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; ManifestFetchData* CreateManifestFetchData(const GURL& update_url, int request_id); diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h index c47ec39..ea9acc6 100644 --- a/chrome/browser/extensions/updater/extension_updater.h +++ b/chrome/browser/extensions/updater/extension_updater.h @@ -192,7 +192,7 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate, const std::string& id, Error error, const PingResult& ping, - const std::set<int>& request_ids) OVERRIDE; + const std::set<int>& request_ids) override; virtual void OnExtensionDownloadFinished( const std::string& id, const base::FilePath& path, @@ -200,16 +200,16 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate, const GURL& download_url, const std::string& version, const PingResult& ping, - const std::set<int>& request_id) OVERRIDE; + const std::set<int>& request_id) override; virtual bool GetPingDataForExtension( const std::string& id, - ManifestFetchData::PingData* ping_data) OVERRIDE; - virtual std::string GetUpdateUrlData(const std::string& id) OVERRIDE; - virtual bool IsExtensionPending(const std::string& id) OVERRIDE; + ManifestFetchData::PingData* ping_data) override; + virtual std::string GetUpdateUrlData(const std::string& id) override; + virtual bool IsExtensionPending(const std::string& id) override; virtual bool GetExtensionExistingVersion(const std::string& id, - std::string* version) OVERRIDE; + std::string* version) override; virtual bool ShouldForceUpdate(const std::string& extension_id, - std::string* source) OVERRIDE; + std::string* source) override; void UpdatePingData(const std::string& id, const PingResult& ping_result); @@ -219,7 +219,7 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate, // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Implementation of ExtensionRegistryObserver. virtual void OnExtensionWillBeInstalled( @@ -227,7 +227,7 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate, const Extension* extension, bool is_update, bool from_ephemeral, - const std::string& old_name) OVERRIDE; + const std::string& old_name) override; // Send a notification that update checks are starting. void NotifyStarted(); diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index bd47521..7805c05 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc @@ -238,7 +238,7 @@ class NotificationsObserver : public content::NotificationObserver { private: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { if (!quit_closure_.is_null()) quit_closure_.Run(); for (size_t i = 0; i < arraysize(kNotificationsObserved); ++i) { @@ -294,7 +294,7 @@ class MockService : public TestExtensionService { virtual ~MockService() {} - virtual PendingExtensionManager* pending_extension_manager() OVERRIDE { + virtual PendingExtensionManager* pending_extension_manager() override { ADD_FAILURE() << "Subclass should override this if it will " << "be accessed by a test."; return &pending_extension_manager_; @@ -441,27 +441,27 @@ class ServiceForManifestTests : public MockService { virtual ~ServiceForManifestTests() {} virtual const Extension* GetExtensionById( - const std::string& id, bool include_disabled) const OVERRIDE { + const std::string& id, bool include_disabled) const override { const Extension* result = registry_->enabled_extensions().GetByID(id); if (result || !include_disabled) return result; return registry_->disabled_extensions().GetByID(id); } - virtual const ExtensionSet* extensions() const OVERRIDE { + virtual const ExtensionSet* extensions() const override { return ®istry_->enabled_extensions(); } - virtual PendingExtensionManager* pending_extension_manager() OVERRIDE { + virtual PendingExtensionManager* pending_extension_manager() override { return &pending_extension_manager_; } virtual const Extension* GetPendingExtensionUpdate( - const std::string& id) const OVERRIDE { + const std::string& id) const override { return NULL; } - virtual bool IsExtensionEnabled(const std::string& id) const OVERRIDE { + virtual bool IsExtensionEnabled(const std::string& id) const override { return !registry_->disabled_extensions().Contains(id); } @@ -498,7 +498,7 @@ class ServiceForDownloadTests : public MockService { const std::string& id, const base::FilePath& extension_path, bool file_ownership_passed, - CrxInstaller** out_crx_installer) OVERRIDE { + CrxInstaller** out_crx_installer) override { extension_id_ = id; install_path_ = extension_path; @@ -510,12 +510,12 @@ class ServiceForDownloadTests : public MockService { return false; } - virtual PendingExtensionManager* pending_extension_manager() OVERRIDE { + virtual PendingExtensionManager* pending_extension_manager() override { return &pending_extension_manager_; } virtual const Extension* GetExtensionById( - const std::string& id, bool) const OVERRIDE { + const std::string& id, bool) const override { last_inquired_extension_id_ = id; return NULL; } @@ -594,11 +594,11 @@ class ExtensionUpdaterTest : public testing::Test { content::TestBrowserThreadBundle::IO_MAINLOOP) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { prefs_.reset(new TestExtensionPrefs(base::MessageLoopProxy::current())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Some tests create URLRequestContextGetters, whose destruction must run // on the IO thread. Make sure the IO loop spins before shutdown so that // those objects are released. diff --git a/chrome/browser/extensions/updater/local_extension_cache_unittest.cc b/chrome/browser/extensions/updater/local_extension_cache_unittest.cc index 7738bb0..d3cd7e2 100644 --- a/chrome/browser/extensions/updater/local_extension_cache_unittest.cc +++ b/chrome/browser/extensions/updater/local_extension_cache_unittest.cc @@ -37,14 +37,14 @@ class LocalExtensionCacheTest : public testing::Test { } // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { pool_owner_.reset( new base::SequencedWorkerPoolOwner(3, "Background Pool")); background_task_runner_ = pool_owner_->pool()->GetSequencedTaskRunner( pool_owner_->pool()->GetNamedSequenceToken("background")); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { pool_owner_->pool()->Shutdown(); base::RunLoop().RunUntilIdle(); } diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc index 35d2d5e7..11e2f8b 100644 --- a/chrome/browser/extensions/user_script_listener.cc +++ b/chrome/browser/extensions/user_script_listener.cc @@ -39,7 +39,7 @@ class UserScriptListener::Throttle } // ResourceThrottle implementation: - virtual void WillStartRequest(bool* defer) OVERRIDE { + virtual void WillStartRequest(bool* defer) override { // Only defer requests if Resume has not yet been called. if (should_defer_) { *defer = true; @@ -47,7 +47,7 @@ class UserScriptListener::Throttle } } - virtual const char* GetNameForLogging() const OVERRIDE { + virtual const char* GetNameForLogging() const override { return "UserScriptListener::Throttle"; } diff --git a/chrome/browser/extensions/user_script_listener.h b/chrome/browser/extensions/user_script_listener.h index 05c24ce..83fb65c 100644 --- a/chrome/browser/extensions/user_script_listener.h +++ b/chrome/browser/extensions/user_script_listener.h @@ -103,7 +103,7 @@ class UserScriptListener // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; content::NotificationRegistrar registrar_; diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc index 4154fd8..b5f616d 100644 --- a/chrome/browser/extensions/user_script_listener_unittest.cc +++ b/chrome/browser/extensions/user_script_listener_unittest.cc @@ -48,16 +48,16 @@ class ThrottleController : public base::SupportsUserData::Data, } // ResourceController implementation: - virtual void Resume() OVERRIDE { + virtual void Resume() override { request_->Start(); } - virtual void Cancel() OVERRIDE { + virtual void Cancel() override { NOTREACHED(); } - virtual void CancelAndIgnore() OVERRIDE { + virtual void CancelAndIgnore() override { NOTREACHED(); } - virtual void CancelWithError(int error_code) OVERRIDE { + virtual void CancelWithError(int error_code) override { NOTREACHED(); } @@ -114,7 +114,7 @@ class SimpleTestJobURLRequestInterceptor // net::URLRequestJobFactory::ProtocolHandler virtual net::URLRequestJob* MaybeInterceptRequest( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { return new SimpleTestJob(request, network_delegate); } @@ -144,7 +144,7 @@ class UserScriptListenerTest : public ExtensionServiceTestBase { "example.com"); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ExtensionServiceTestBase::SetUp(); InitializeEmptyExtensionService(); @@ -154,7 +154,7 @@ class UserScriptListenerTest : public ExtensionServiceTestBase { listener_ = new UserScriptListener(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { listener_ = NULL; base::MessageLoop::current()->RunUntilIdle(); ExtensionServiceTestBase::TearDown(); diff --git a/chrome/browser/extensions/user_script_loader.h b/chrome/browser/extensions/user_script_loader.h index 32dcfdc..85d1bb1 100644 --- a/chrome/browser/extensions/user_script_loader.h +++ b/chrome/browser/extensions/user_script_loader.h @@ -80,13 +80,13 @@ class UserScriptLoader : 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; // ExtensionRegistryObserver implementation. virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // Initiates script load when we have been waiting for the extension system // to be ready. diff --git a/chrome/browser/extensions/user_script_loader_unittest.cc b/chrome/browser/extensions/user_script_loader_unittest.cc index 46023ec..7a6938e 100644 --- a/chrome/browser/extensions/user_script_loader_unittest.cc +++ b/chrome/browser/extensions/user_script_loader_unittest.cc @@ -65,7 +65,7 @@ class UserScriptLoaderTest : public testing::Test, virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { DCHECK(type == extensions::NOTIFICATION_USER_SCRIPTS_UPDATED); shared_memory_ = content::Details<base::SharedMemory>(details).ptr(); diff --git a/chrome/browser/extensions/webstore_data_fetcher.h b/chrome/browser/extensions/webstore_data_fetcher.h index b11ac97..a7abe31 100644 --- a/chrome/browser/extensions/webstore_data_fetcher.h +++ b/chrome/browser/extensions/webstore_data_fetcher.h @@ -47,7 +47,7 @@ class WebstoreDataFetcher : public base::SupportsWeakPtr<WebstoreDataFetcher>, void OnJsonParseFailure(const std::string& error); // net::URLFetcherDelegate overrides: - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; WebstoreDataFetcherDelegate* delegate_; net::URLRequestContextGetter* request_context_; diff --git a/chrome/browser/extensions/webstore_inline_installer.h b/chrome/browser/extensions/webstore_inline_installer.h index 7e7e792..d1cf65d 100644 --- a/chrome/browser/extensions/webstore_inline_installer.h +++ b/chrome/browser/extensions/webstore_inline_installer.h @@ -42,23 +42,23 @@ class WebstoreInlineInstaller virtual ~WebstoreInlineInstaller(); // Implementations WebstoreStandaloneInstaller Template Method's hooks. - virtual bool CheckRequestorAlive() const OVERRIDE; - virtual const GURL& GetRequestorURL() const OVERRIDE; - virtual bool ShouldShowPostInstallUI() const OVERRIDE; - virtual bool ShouldShowAppInstalledBubble() const OVERRIDE; - virtual content::WebContents* GetWebContents() const OVERRIDE; + virtual bool CheckRequestorAlive() const override; + virtual const GURL& GetRequestorURL() const override; + virtual bool ShouldShowPostInstallUI() const override; + virtual bool ShouldShowAppInstalledBubble() const override; + virtual content::WebContents* GetWebContents() const override; virtual scoped_refptr<ExtensionInstallPrompt::Prompt> CreateInstallPrompt() - const OVERRIDE; + const override; virtual bool CheckInlineInstallPermitted( const base::DictionaryValue& webstore_data, - std::string* error) const OVERRIDE; + std::string* error) const override; virtual bool CheckRequestorPermitted( const base::DictionaryValue& webstore_data, - std::string* error) const OVERRIDE; + std::string* error) const override; private: // content::WebContentsObserver interface implementation. - virtual void WebContentsDestroyed() OVERRIDE; + virtual void WebContentsDestroyed() override; // Checks whether the install is initiated by a page in a verified site // (which is at least a domain, but can also have a port or a path). diff --git a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc index b741925..2400647 100644 --- a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc +++ b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc @@ -55,7 +55,7 @@ class ProgrammableInstallPrompt : public ExtensionInstallPrompt { Delegate* delegate, const Extension* extension, SkBitmap* icon, - scoped_refptr<ExtensionInstallPrompt::Prompt> prompt) OVERRIDE { + scoped_refptr<ExtensionInstallPrompt::Prompt> prompt) override { delegate_ = delegate; } @@ -93,7 +93,7 @@ class WebstoreInlineInstallerForTest : public WebstoreInlineInstaller { programmable_prompt_(NULL) { } - virtual scoped_ptr<ExtensionInstallPrompt> CreateInstallUI() OVERRIDE { + virtual scoped_ptr<ExtensionInstallPrompt> CreateInstallUI() override { programmable_prompt_ = new ProgrammableInstallPrompt(web_contents()); return make_scoped_ptr(programmable_prompt_). PassAs<ExtensionInstallPrompt>(); @@ -119,7 +119,7 @@ class WebstoreInlineInstallerForTestFactory : WebContents* contents, const std::string& webstore_item_id, const GURL& requestor_url, - const WebstoreStandaloneInstaller::Callback& callback) OVERRIDE { + const WebstoreStandaloneInstaller::Callback& callback) override { return new WebstoreInlineInstallerForTest( contents, webstore_item_id, requestor_url, callback); } diff --git a/chrome/browser/extensions/webstore_inline_installer_unittest.cc b/chrome/browser/extensions/webstore_inline_installer_unittest.cc index 493d3c9..91cdf91 100644 --- a/chrome/browser/extensions/webstore_inline_installer_unittest.cc +++ b/chrome/browser/extensions/webstore_inline_installer_unittest.cc @@ -52,8 +52,8 @@ TestWebstoreInlineInstaller::~TestWebstoreInlineInstaller() {} class WebstoreInlineInstallerTest : public ChromeRenderViewHostTestHarness { public: // testing::Test - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; bool TestSingleVerifiedSite(const std::string& requestor_url, const std::string& verified_site); diff --git a/chrome/browser/extensions/webstore_install_helper.h b/chrome/browser/extensions/webstore_install_helper.h index 370ce9c27..bcb1f82 100644 --- a/chrome/browser/extensions/webstore_install_helper.h +++ b/chrome/browser/extensions/webstore_install_helper.h @@ -84,10 +84,10 @@ class WebstoreInstallHelper : public content::UtilityProcessHostClient, void ReportResultFromUIThread(); // Implementing the net::URLFetcherDelegate interface. - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; // Implementing pieces of the UtilityProcessHostClient interface. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // Message handlers. void OnDecodeImageSucceeded(const SkBitmap& decoded_image); diff --git a/chrome/browser/extensions/webstore_install_with_prompt.h b/chrome/browser/extensions/webstore_install_with_prompt.h index 9c4ac26..91ec9be 100644 --- a/chrome/browser/extensions/webstore_install_with_prompt.h +++ b/chrome/browser/extensions/webstore_install_with_prompt.h @@ -51,24 +51,24 @@ class WebstoreInstallWithPrompt : public WebstoreStandaloneInstaller, void set_show_post_install_ui(bool show) { show_post_install_ui_ = show; } // extensions::WebstoreStandaloneInstaller overrides: - virtual bool CheckRequestorAlive() const OVERRIDE; - virtual const GURL& GetRequestorURL() const OVERRIDE; - virtual bool ShouldShowPostInstallUI() const OVERRIDE; - virtual bool ShouldShowAppInstalledBubble() const OVERRIDE; - virtual content::WebContents* GetWebContents() const OVERRIDE; + virtual bool CheckRequestorAlive() const override; + virtual const GURL& GetRequestorURL() const override; + virtual bool ShouldShowPostInstallUI() const override; + virtual bool ShouldShowAppInstalledBubble() const override; + virtual content::WebContents* GetWebContents() const override; virtual scoped_refptr<ExtensionInstallPrompt::Prompt> CreateInstallPrompt() - const OVERRIDE; - virtual scoped_ptr<ExtensionInstallPrompt> CreateInstallUI() OVERRIDE; + const override; + virtual scoped_ptr<ExtensionInstallPrompt> CreateInstallUI() override; virtual bool CheckInlineInstallPermitted( const base::DictionaryValue& webstore_data, - std::string* error) const OVERRIDE; + std::string* error) const override; virtual bool CheckRequestorPermitted( const base::DictionaryValue& webstore_data, - std::string* error) const OVERRIDE; + std::string* error) const override; // content::PageNavigator overrides: virtual content::WebContents* OpenURL( - const content::OpenURLParams& params) OVERRIDE; + const content::OpenURLParams& params) override; private: bool show_post_install_ui_; diff --git a/chrome/browser/extensions/webstore_installer.h b/chrome/browser/extensions/webstore_installer.h index d693c25..962944d 100644 --- a/chrome/browser/extensions/webstore_installer.h +++ b/chrome/browser/extensions/webstore_installer.h @@ -196,12 +196,12 @@ class WebstoreInstaller : public content::NotificationObserver, // content::NotificationObserver. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // ExtensionRegistryObserver. virtual void OnExtensionInstalled(content::BrowserContext* browser_context, const Extension* extension, - bool is_update) OVERRIDE; + bool is_update) override; // Removes the reference to the delegate passed in the constructor. Used when // the delegate object must be deleted before this object. @@ -227,8 +227,8 @@ class WebstoreInstaller : public content::NotificationObserver, content::DownloadInterruptReason interrupt_reason); // DownloadItem::Observer implementation: - virtual void OnDownloadUpdated(content::DownloadItem* download) OVERRIDE; - virtual void OnDownloadDestroyed(content::DownloadItem* download) OVERRIDE; + virtual void OnDownloadUpdated(content::DownloadItem* download) override; + virtual void OnDownloadDestroyed(content::DownloadItem* download) override; // Downloads next pending module in |pending_modules_|. void DownloadNextPendingModule(); diff --git a/chrome/browser/extensions/webstore_installer_test.h b/chrome/browser/extensions/webstore_installer_test.h index f6d9af36..2aa0523 100644 --- a/chrome/browser/extensions/webstore_installer_test.h +++ b/chrome/browser/extensions/webstore_installer_test.h @@ -24,9 +24,9 @@ class WebstoreInstallerTest : public ExtensionBrowserTest { const std::string& unverified_domain); virtual ~WebstoreInstallerTest(); - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; + virtual void SetUpCommandLine(base::CommandLine* command_line) override; + virtual void SetUpInProcessBrowserTestFixture() override; + virtual void SetUpOnMainThread() override; protected: GURL GenerateTestServerUrl(const std::string& domain, diff --git a/chrome/browser/extensions/webstore_reinstaller.h b/chrome/browser/extensions/webstore_reinstaller.h index 7706e62..aaea570 100644 --- a/chrome/browser/extensions/webstore_reinstaller.h +++ b/chrome/browser/extensions/webstore_reinstaller.h @@ -29,23 +29,23 @@ class WebstoreReinstaller : public WebstoreStandaloneInstaller, virtual ~WebstoreReinstaller(); // WebstoreStandaloneInstaller: - virtual bool CheckRequestorAlive() const OVERRIDE; - virtual const GURL& GetRequestorURL() const OVERRIDE; - virtual bool ShouldShowPostInstallUI() const OVERRIDE; - virtual bool ShouldShowAppInstalledBubble() const OVERRIDE; - virtual content::WebContents* GetWebContents() const OVERRIDE; + virtual bool CheckRequestorAlive() const override; + virtual const GURL& GetRequestorURL() const override; + virtual bool ShouldShowPostInstallUI() const override; + virtual bool ShouldShowAppInstalledBubble() const override; + virtual content::WebContents* GetWebContents() const override; virtual scoped_refptr<ExtensionInstallPrompt::Prompt> CreateInstallPrompt() - const OVERRIDE; + const override; virtual bool CheckInlineInstallPermitted( const base::DictionaryValue& webstore_data, - std::string* error) const OVERRIDE; + std::string* error) const override; virtual bool CheckRequestorPermitted( const base::DictionaryValue& webstore_data, - std::string* error) const OVERRIDE; - virtual void InstallUIProceed() OVERRIDE; + std::string* error) const override; + virtual void InstallUIProceed() override; // content::WebContentsObserver: - virtual void WebContentsDestroyed() OVERRIDE; + virtual void WebContentsDestroyed() override; // Called once all data from the old extension installation is removed. void OnDeletionDone(); diff --git a/chrome/browser/extensions/webstore_standalone_installer.h b/chrome/browser/extensions/webstore_standalone_installer.h index e36f2a2..4f42b9b 100644 --- a/chrome/browser/extensions/webstore_standalone_installer.h +++ b/chrome/browser/extensions/webstore_standalone_installer.h @@ -152,8 +152,8 @@ class WebstoreStandaloneInstaller virtual scoped_ptr<WebstoreInstaller::Approval> CreateApproval() const; // ExtensionInstallPrompt::Delegate interface implementation. - virtual void InstallUIProceed() OVERRIDE; - virtual void InstallUIAbort(bool user_initiated) OVERRIDE; + virtual void InstallUIProceed() override; + virtual void InstallUIAbort(bool user_initiated) override; // Accessors to be used by subclasses. bool show_user_count() const { return show_user_count_; } @@ -193,30 +193,30 @@ class WebstoreStandaloneInstaller // informs our delegate of success/failure. // WebstoreDataFetcherDelegate interface implementation. - virtual void OnWebstoreRequestFailure() OVERRIDE; + virtual void OnWebstoreRequestFailure() override; virtual void OnWebstoreResponseParseSuccess( - scoped_ptr<base::DictionaryValue> webstore_data) OVERRIDE; + scoped_ptr<base::DictionaryValue> webstore_data) override; virtual void OnWebstoreResponseParseFailure( - const std::string& error) OVERRIDE; + const std::string& error) override; // WebstoreInstallHelper::Delegate interface implementation. virtual void OnWebstoreParseSuccess( const std::string& id, const SkBitmap& icon, - base::DictionaryValue* parsed_manifest) OVERRIDE; + base::DictionaryValue* parsed_manifest) override; virtual void OnWebstoreParseFailure( const std::string& id, InstallHelperResultCode result_code, - const std::string& error_message) OVERRIDE; + const std::string& error_message) override; // WebstoreInstaller::Delegate interface implementation. - virtual void OnExtensionInstallSuccess(const std::string& id) OVERRIDE; + virtual void OnExtensionInstallSuccess(const std::string& id) override; virtual void OnExtensionInstallFailure( const std::string& id, const std::string& error, - WebstoreInstaller::FailureReason reason) OVERRIDE; + WebstoreInstaller::FailureReason reason) override; void ShowInstallUI(); void OnWebStoreDataFetcherDone(); diff --git a/chrome/browser/extensions/webstore_startup_installer.h b/chrome/browser/extensions/webstore_startup_installer.h index b90eba6..63430ff 100644 --- a/chrome/browser/extensions/webstore_startup_installer.h +++ b/chrome/browser/extensions/webstore_startup_installer.h @@ -31,7 +31,7 @@ class WebstoreStartupInstaller : public WebstoreInstallWithPrompt { // Implementations of WebstoreStandaloneInstaller Template Method's hooks. virtual scoped_refptr<ExtensionInstallPrompt::Prompt> CreateInstallPrompt() - const OVERRIDE; + const override; private: bool show_prompt_; diff --git a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc index ea9d965..e833c60 100644 --- a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc +++ b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc @@ -178,7 +178,7 @@ class WebstoreStartupInstallerSupervisedUsersTest : public WebstoreStartupInstallerTest { public: // InProcessBrowserTest overrides: - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(base::CommandLine* command_line) override { WebstoreStartupInstallerTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf"); } @@ -212,7 +212,7 @@ IN_PROC_BROWSER_TEST_F(WebstoreStartupInstallerSupervisedUsersTest, class WebstoreStartupInstallUnpackFailureTest : public WebstoreStartupInstallerTest { public: - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(base::CommandLine* command_line) override { WebstoreStartupInstallerTest::SetUpCommandLine(command_line); GURL crx_url = GenerateTestServerUrl( @@ -221,7 +221,7 @@ class WebstoreStartupInstallUnpackFailureTest switches::kAppsGalleryUpdateURL, crx_url.spec()); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { WebstoreStartupInstallerTest::SetUpInProcessBrowserTestFixture(); ExtensionInstallUI::set_disable_failure_ui_for_tests(); } @@ -246,14 +246,14 @@ class CommandLineWebstoreInstall CommandLineWebstoreInstall() : saw_install_(false), browser_open_count_(0) {} virtual ~CommandLineWebstoreInstall() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { WebstoreStartupInstallerTest::SetUpOnMainThread(); extensions::ExtensionRegistry::Get(browser()->profile())->AddObserver(this); registrar_.Add(this, chrome::NOTIFICATION_BROWSER_OPENED, content::NotificationService::AllSources()); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { extensions::ExtensionRegistry::Get(browser()->profile()) ->RemoveObserver(this); WebstoreStartupInstallerTest::TearDownOnMainThread(); @@ -266,7 +266,7 @@ class CommandLineWebstoreInstall // NotificationObserver interface. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { DCHECK_EQ(type, chrome::NOTIFICATION_BROWSER_OPENED); ++browser_open_count_; } @@ -276,7 +276,7 @@ class CommandLineWebstoreInstall const extensions::Extension* extension, bool is_update, bool from_ephemeral, - const std::string& old_name) OVERRIDE { + const std::string& old_name) override { EXPECT_EQ(extension->id(), kTestExtensionId); saw_install_ = true; } diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index cb55a62..cd3d11a 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -233,7 +233,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowArgumentsOverflow) { } class WindowOpenPanelDisabledTest : public ExtensionApiTest { - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); // TODO(jennb): Re-enable when panels are enabled by default. // command_line->AppendSwitch(switches::kDisablePanels); @@ -246,7 +246,7 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelDisabledTest, } class WindowOpenPanelTest : public ExtensionApiTest { - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnablePanels); } diff --git a/chrome/browser/extensions/window_open_interactive_apitest.cc b/chrome/browser/extensions/window_open_interactive_apitest.cc index ca82081..62f21f3 100644 --- a/chrome/browser/extensions/window_open_interactive_apitest.cc +++ b/chrome/browser/extensions/window_open_interactive_apitest.cc @@ -7,7 +7,7 @@ #include "chrome/common/chrome_switches.h" class WindowOpenPanelTest : public ExtensionApiTest { - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnablePanels); } diff --git a/chrome/browser/extensions/zipfile_installer.h b/chrome/browser/extensions/zipfile_installer.h index e6d39d9..0420a6bb 100644 --- a/chrome/browser/extensions/zipfile_installer.h +++ b/chrome/browser/extensions/zipfile_installer.h @@ -35,7 +35,7 @@ class ZipFileInstaller : public content::UtilityProcessHostClient { void set_be_noisy_on_failure(bool value) { be_noisy_on_failure_ = value; } // UtilityProcessHostClient - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: explicit ZipFileInstaller(ExtensionService* extension_service); diff --git a/chrome/browser/extensions/zipfile_installer_unittest.cc b/chrome/browser/extensions/zipfile_installer_unittest.cc index aae76bd..dd06f5d 100644 --- a/chrome/browser/extensions/zipfile_installer_unittest.cc +++ b/chrome/browser/extensions/zipfile_installer_unittest.cc @@ -47,7 +47,7 @@ struct MockExtensionRegistryObserver : public ExtensionRegistryObserver { const Extension* extension, bool is_update, bool from_ephemeral, - const std::string& old_name) OVERRIDE { + const std::string& old_name) override { last_extension_installed = extension->id(); quit_closure_.Run(); } |