diff options
| author | mostynb <mostynb@opera.com> | 2014-10-06 19:47:17 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 02:47:40 +0000 |
| commit | 2b52d1db45a00ab445d99be58631204f077f1353 (patch) | |
| tree | 73e244aef504cf024369fa486f48b7af4de9fe56 /chrome | |
| parent | bb7c6eb7180a649af44634dee6e48331d1a71d13 (diff) | |
| download | chromium_src-2b52d1db45a00ab445d99be58631204f077f1353.zip chromium_src-2b52d1db45a00ab445d99be58631204f077f1353.tar.gz chromium_src-2b52d1db45a00ab445d99be58631204f077f1353.tar.bz2 | |
replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]*
BUG=417463
Review URL: https://codereview.chromium.org/624173002
Cr-Commit-Position: refs/heads/master@{#298338}
Diffstat (limited to 'chrome')
431 files changed, 2068 insertions, 2068 deletions
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc index fd59e2f..842103f 100644 --- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc +++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc @@ -103,7 +103,7 @@ class RepeatedNotificationObserver : public content::NotificationObserver { virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { ASSERT_GT(num_outstanding_, 0); if (!--num_outstanding_ && running_) { content::BrowserThread::PostTask( @@ -149,7 +149,7 @@ class TestBrowserCloseManager : public BrowserCloseManager { virtual void ConfirmCloseWithPendingDownloads( int download_count, - const base::Callback<void(bool)>& callback) OVERRIDE { + const base::Callback<void(bool)>& callback) override { EXPECT_NE(NO_USER_CHOICE, user_choice_); switch (user_choice_) { case NO_USER_CHOICE: @@ -183,7 +183,7 @@ class TestDownloadManagerDelegate : public ChromeDownloadManagerDelegate { virtual bool DetermineDownloadTarget( content::DownloadItem* item, - const content::DownloadTargetCallback& callback) OVERRIDE { + const content::DownloadTargetCallback& callback) override { content::DownloadTargetCallback dangerous_callback = base::Bind(&TestDownloadManagerDelegate::SetDangerous, callback); return ChromeDownloadManagerDelegate::DetermineDownloadTarget( @@ -211,12 +211,12 @@ class FakeBackgroundModeManager : public BackgroundModeManager { &g_browser_process->profile_manager()->GetProfileInfoCache()), suspended_(false) {} - virtual void SuspendBackgroundMode() OVERRIDE { + virtual void SuspendBackgroundMode() override { BackgroundModeManager::SuspendBackgroundMode(); suspended_ = true; } - virtual void ResumeBackgroundMode() OVERRIDE { + virtual void ResumeBackgroundMode() override { BackgroundModeManager::ResumeBackgroundMode(); suspended_ = false; } @@ -237,7 +237,7 @@ class BrowserCloseManagerBrowserTest : public InProcessBrowserTest, public testing::WithParamInterface<bool> { protected: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { InProcessBrowserTest::SetUpOnMainThread(); SessionStartupPref::SetStartupPref( browser()->profile(), SessionStartupPref(SessionStartupPref::LAST)); @@ -249,7 +249,7 @@ class BrowserCloseManagerBrowserTest base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true)); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { if (GetParam()) command_line->AppendSwitch(switches::kEnableFastUnload); #if defined(OS_CHROMEOS) @@ -712,7 +712,7 @@ class BrowserCloseManagerWithDownloadsBrowserTest : BrowserCloseManagerWithDownloadsBrowserTest() {} virtual ~BrowserCloseManagerWithDownloadsBrowserTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { BrowserCloseManagerBrowserTest::SetUpOnMainThread(); ASSERT_TRUE(scoped_download_directory_.CreateUniqueTempDir()); } @@ -895,7 +895,7 @@ class BrowserCloseManagerWithBackgroundModeBrowserTest public: BrowserCloseManagerWithBackgroundModeBrowserTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { BrowserCloseManagerBrowserTest::SetUpOnMainThread(); g_browser_process->set_background_mode_manager_for_test( scoped_ptr<BackgroundModeManager>(new FakeBackgroundModeManager)); diff --git a/chrome/browser/local_discovery/cloud_device_list.h b/chrome/browser/local_discovery/cloud_device_list.h index afdd2c1..baff562 100644 --- a/chrome/browser/local_discovery/cloud_device_list.h +++ b/chrome/browser/local_discovery/cloud_device_list.h @@ -22,12 +22,12 @@ class CloudDeviceList : public GCDApiFlowRequest { explicit CloudDeviceList(CloudDeviceListDelegate* delegate); virtual ~CloudDeviceList(); - virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) OVERRIDE; + virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) override; virtual void OnGCDAPIFlowComplete( - const base::DictionaryValue& value) OVERRIDE; + const base::DictionaryValue& value) override; - virtual GURL GetURL() OVERRIDE; + virtual GURL GetURL() override; private: bool FillDeviceDetails(const base::DictionaryValue& value, diff --git a/chrome/browser/local_discovery/cloud_print_printer_list.h b/chrome/browser/local_discovery/cloud_print_printer_list.h index e5abc64..343fa48 100644 --- a/chrome/browser/local_discovery/cloud_print_printer_list.h +++ b/chrome/browser/local_discovery/cloud_print_printer_list.h @@ -19,12 +19,12 @@ class CloudPrintPrinterList : public CloudPrintApiFlowRequest { explicit CloudPrintPrinterList(CloudDeviceListDelegate* delegate); virtual ~CloudPrintPrinterList(); - virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) OVERRIDE; + virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) override; virtual void OnGCDAPIFlowComplete( - const base::DictionaryValue& value) OVERRIDE; + const base::DictionaryValue& value) override; - virtual GURL GetURL() OVERRIDE; + virtual GURL GetURL() override; private: bool FillPrinterDetails(const base::DictionaryValue& printer_value, diff --git a/chrome/browser/local_discovery/gcd_api_flow.h b/chrome/browser/local_discovery/gcd_api_flow.h index e4c7d87..42807fd 100644 --- a/chrome/browser/local_discovery/gcd_api_flow.h +++ b/chrome/browser/local_discovery/gcd_api_flow.h @@ -73,8 +73,8 @@ class GCDApiFlowRequest : public GCDApiFlow::Request { virtual ~GCDApiFlowRequest(); // GCDApiFlowRequest implementation - virtual std::string GetOAuthScope() OVERRIDE; - virtual std::vector<std::string> GetExtraRequestHeaders() OVERRIDE; + virtual std::string GetOAuthScope() override; + virtual std::vector<std::string> GetExtraRequestHeaders() override; private: DISALLOW_COPY_AND_ASSIGN(GCDApiFlowRequest); @@ -86,8 +86,8 @@ class CloudPrintApiFlowRequest : public GCDApiFlow::Request { virtual ~CloudPrintApiFlowRequest(); // GCDApiFlowRequest implementation - virtual std::string GetOAuthScope() OVERRIDE; - virtual std::vector<std::string> GetExtraRequestHeaders() OVERRIDE; + virtual std::string GetOAuthScope() override; + virtual std::vector<std::string> GetExtraRequestHeaders() override; private: DISALLOW_COPY_AND_ASSIGN(CloudPrintApiFlowRequest); diff --git a/chrome/browser/local_discovery/gcd_api_flow_impl.h b/chrome/browser/local_discovery/gcd_api_flow_impl.h index b636cfd..f206e93 100644 --- a/chrome/browser/local_discovery/gcd_api_flow_impl.h +++ b/chrome/browser/local_discovery/gcd_api_flow_impl.h @@ -26,17 +26,17 @@ class GCDApiFlowImpl : public GCDApiFlow, virtual ~GCDApiFlowImpl(); - virtual void Start(scoped_ptr<Request> request) OVERRIDE; + virtual void Start(scoped_ptr<Request> request) override; // net::URLFetcherDelegate implementation: - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) 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; private: void CreateRequest(const GURL& url); diff --git a/chrome/browser/local_discovery/gcd_api_flow_unittest.cc b/chrome/browser/local_discovery/gcd_api_flow_unittest.cc index 02c27a3..a9edd86 100644 --- a/chrome/browser/local_discovery/gcd_api_flow_unittest.cc +++ b/chrome/browser/local_discovery/gcd_api_flow_unittest.cc @@ -51,7 +51,7 @@ class GCDApiFlowTest : public testing::Test { virtual ~GCDApiFlowTest() {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { token_service_.set_request_context(request_context_.get()); token_service_.AddAccount(account_id_); ui_thread_.Stop(); // HACK: Fake being on the UI thread diff --git a/chrome/browser/local_discovery/gcd_registration_ticket_request.h b/chrome/browser/local_discovery/gcd_registration_ticket_request.h index eb313de..3956e4d 100644 --- a/chrome/browser/local_discovery/gcd_registration_ticket_request.h +++ b/chrome/browser/local_discovery/gcd_registration_ticket_request.h @@ -25,12 +25,12 @@ class GCDRegistrationTicketRequest : public GCDApiFlowRequest { // GCDApiFlowImpl::Request implementation. virtual void GetUploadData(std::string* upload_type, - std::string* upload_data) OVERRIDE; - virtual net::URLFetcher::RequestType GetRequestType() OVERRIDE; - virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) OVERRIDE; + std::string* upload_data) override; + virtual net::URLFetcher::RequestType GetRequestType() override; + virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) override; virtual void OnGCDAPIFlowComplete( - const base::DictionaryValue& value) OVERRIDE; - virtual GURL GetURL() OVERRIDE; + const base::DictionaryValue& value) override; + virtual GURL GetURL() override; private: ResponseCallback callback_; diff --git a/chrome/browser/local_discovery/privet_confirm_api_flow.h b/chrome/browser/local_discovery/privet_confirm_api_flow.h index 5da9a61..de1e8d3 100644 --- a/chrome/browser/local_discovery/privet_confirm_api_flow.h +++ b/chrome/browser/local_discovery/privet_confirm_api_flow.h @@ -24,12 +24,12 @@ class PrivetConfirmApiCallFlow : public CloudPrintApiFlowRequest { virtual ~PrivetConfirmApiCallFlow(); - virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) OVERRIDE; + virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) override; virtual void OnGCDAPIFlowComplete( - const base::DictionaryValue& value) OVERRIDE; - virtual net::URLFetcher::RequestType GetRequestType() OVERRIDE; + const base::DictionaryValue& value) override; + virtual net::URLFetcher::RequestType GetRequestType() override; - virtual GURL GetURL() OVERRIDE; + virtual GURL GetURL() override; private: ResponseCallback callback_; diff --git a/chrome/browser/local_discovery/privet_device_lister_impl.h b/chrome/browser/local_discovery/privet_device_lister_impl.h index a1888ae..2292718 100644 --- a/chrome/browser/local_discovery/privet_device_lister_impl.h +++ b/chrome/browser/local_discovery/privet_device_lister_impl.h @@ -28,15 +28,15 @@ class PrivetDeviceListerImpl : public PrivetDeviceLister, virtual ~PrivetDeviceListerImpl(); - virtual void Start() OVERRIDE; - virtual void DiscoverNewDevices(bool force_update) OVERRIDE; + virtual void Start() override; + virtual void DiscoverNewDevices(bool force_update) override; protected: virtual void OnDeviceChanged( bool added, - const ServiceDescription& service_description) OVERRIDE; - virtual void OnDeviceRemoved(const std::string& service_name) OVERRIDE; - virtual void OnDeviceCacheFlushed() OVERRIDE; + const ServiceDescription& service_description) override; + virtual void OnDeviceRemoved(const std::string& service_name) override; + virtual void OnDeviceCacheFlushed() override; private: PrivetDeviceLister::Delegate* delegate_; diff --git a/chrome/browser/local_discovery/privet_device_lister_unittest.cc b/chrome/browser/local_discovery/privet_device_lister_unittest.cc index 4f3b9c9..8027487 100644 --- a/chrome/browser/local_discovery/privet_device_lister_unittest.cc +++ b/chrome/browser/local_discovery/privet_device_lister_unittest.cc @@ -79,7 +79,7 @@ class MockServiceResolver : public ServiceResolver { virtual ~MockServiceResolver() { } - virtual void StartResolving() OVERRIDE { + virtual void StartResolving() override { started_resolving_ = true; mock_delegate_->ServiceResolverStarted(service_name_, this); } @@ -88,7 +88,7 @@ class MockServiceResolver : public ServiceResolver { return started_resolving_; } - virtual std::string GetName() const OVERRIDE { + virtual std::string GetName() const override { return service_name_; } @@ -116,7 +116,7 @@ class MockServiceDiscoveryClient : public ServiceDiscoveryClient { // on service type |service_type|. virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher( const std::string& service_type, - const ServiceWatcher::UpdatedCallback& callback) OVERRIDE { + const ServiceWatcher::UpdatedCallback& callback) override { scoped_ptr<MockServiceWatcher> mock_service_watcher( new MockServiceWatcher(service_type, callback, mock_delegate_)); return mock_service_watcher.PassAs<ServiceWatcher>(); @@ -126,7 +126,7 @@ class MockServiceDiscoveryClient : public ServiceDiscoveryClient { // for the service called |service_name|. virtual scoped_ptr<ServiceResolver> CreateServiceResolver( const std::string& service_name, - const ServiceResolver::ResolveCompleteCallback& callback) OVERRIDE { + const ServiceResolver::ResolveCompleteCallback& callback) override { scoped_ptr<MockServiceResolver> mock_service_resolver( new MockServiceResolver(service_name, callback, mock_delegate_)); return mock_service_resolver.PassAs<ServiceResolver>(); @@ -136,7 +136,7 @@ class MockServiceDiscoveryClient : public ServiceDiscoveryClient { virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver( const std::string& domain, net::AddressFamily address_family, - const LocalDomainResolver::IPAddressCallback& callback) OVERRIDE { + const LocalDomainResolver::IPAddressCallback& callback) override { NOTREACHED(); return scoped_ptr<LocalDomainResolver>(); } @@ -178,7 +178,7 @@ class PrivetDeviceListerTest : public testing::Test { virtual ~PrivetDeviceListerTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { example_attrs_.push_back("tXtvers=1"); example_attrs_.push_back("ty=My Printer"); example_attrs_.push_back("nOte=This is my Printer"); diff --git a/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.h b/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.h index 880ce01..c151b7a 100644 --- a/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.h +++ b/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.h @@ -21,7 +21,7 @@ class PrivetHTTPAsynchronousFactoryImpl : public PrivetHTTPAsynchronousFactory { virtual scoped_ptr<PrivetHTTPResolution> CreatePrivetHTTP( const std::string& name, const net::HostPortPair& address, - const ResultCallback& callback) OVERRIDE; + const ResultCallback& callback) override; private: class ResolutionImpl : public PrivetHTTPResolution { @@ -33,8 +33,8 @@ class PrivetHTTPAsynchronousFactoryImpl : public PrivetHTTPAsynchronousFactory { net::URLRequestContextGetter* request_context); virtual ~ResolutionImpl(); - virtual void Start() OVERRIDE; - virtual const std::string& GetName() OVERRIDE; + virtual void Start() override; + virtual const std::string& GetName() override; private: void ResolveComplete(bool success, diff --git a/chrome/browser/local_discovery/privet_http_asynchronous_factory_mac.h b/chrome/browser/local_discovery/privet_http_asynchronous_factory_mac.h index cd25d680..4d54648 100644 --- a/chrome/browser/local_discovery/privet_http_asynchronous_factory_mac.h +++ b/chrome/browser/local_discovery/privet_http_asynchronous_factory_mac.h @@ -19,7 +19,7 @@ class PrivetHTTPAsynchronousFactoryMac : public PrivetHTTPAsynchronousFactory { virtual scoped_ptr<PrivetHTTPResolution> CreatePrivetHTTP( const std::string& name, const net::HostPortPair& address, - const ResultCallback& callback) OVERRIDE; + const ResultCallback& callback) override; private: class ResolutionMac : public PrivetHTTPResolution { @@ -30,8 +30,8 @@ class PrivetHTTPAsynchronousFactoryMac : public PrivetHTTPAsynchronousFactory { const ResultCallback& callback); virtual ~ResolutionMac(); - virtual void Start() OVERRIDE; - virtual const std::string& GetName() OVERRIDE; + virtual void Start() override; + virtual const std::string& GetName() override; private: net::URLRequestContextGetter* request_context_; diff --git a/chrome/browser/local_discovery/privet_http_impl.h b/chrome/browser/local_discovery/privet_http_impl.h index 0d934f5..cfcef7b 100644 --- a/chrome/browser/local_discovery/privet_http_impl.h +++ b/chrome/browser/local_discovery/privet_http_impl.h @@ -31,15 +31,15 @@ class PrivetInfoOperationImpl : public PrivetJSONOperation, const PrivetJSONOperation::ResultCallback& callback); virtual ~PrivetInfoOperationImpl(); - virtual void Start() OVERRIDE; + virtual void Start() override; - virtual PrivetHTTPClient* GetHTTPClient() OVERRIDE; + virtual PrivetHTTPClient* GetHTTPClient() override; virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) OVERRIDE; + PrivetURLFetcher::ErrorType error) override; virtual void OnParsedJson(PrivetURLFetcher* fetcher, const base::DictionaryValue& value, - bool has_error) OVERRIDE; + bool has_error) override; private: PrivetHTTPClient* privet_client_; @@ -57,22 +57,22 @@ class PrivetRegisterOperationImpl PrivetRegisterOperation::Delegate* delegate); virtual ~PrivetRegisterOperationImpl(); - virtual void Start() OVERRIDE; - virtual void Cancel() OVERRIDE; - virtual void CompleteRegistration() OVERRIDE; + virtual void Start() override; + virtual void Cancel() override; + virtual void CompleteRegistration() override; virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) OVERRIDE; + PrivetURLFetcher::ErrorType error) override; virtual void OnParsedJson(PrivetURLFetcher* fetcher, const base::DictionaryValue& value, - bool has_error) OVERRIDE; + bool has_error) override; virtual void OnNeedPrivetToken( PrivetURLFetcher* fetcher, - const PrivetURLFetcher::TokenCallback& callback) OVERRIDE; + const PrivetURLFetcher::TokenCallback& callback) override; - virtual PrivetHTTPClient* GetHTTPClient() OVERRIDE; + virtual PrivetHTTPClient* GetHTTPClient() override; private: class Cancelation : public PrivetURLFetcher::Delegate { public: @@ -80,11 +80,11 @@ class PrivetRegisterOperationImpl virtual ~Cancelation(); virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) OVERRIDE; + PrivetURLFetcher::ErrorType error) override; virtual void OnParsedJson(PrivetURLFetcher* fetcher, const base::DictionaryValue& value, - bool has_error) OVERRIDE; + bool has_error) override; void Cleanup(); @@ -127,18 +127,18 @@ class PrivetJSONOperationImpl : public PrivetJSONOperation, const std::string& query_params, const PrivetJSONOperation::ResultCallback& callback); virtual ~PrivetJSONOperationImpl(); - virtual void Start() OVERRIDE; + virtual void Start() override; - virtual PrivetHTTPClient* GetHTTPClient() OVERRIDE; + virtual PrivetHTTPClient* GetHTTPClient() override; virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) OVERRIDE; + PrivetURLFetcher::ErrorType error) override; virtual void OnParsedJson(PrivetURLFetcher* fetcher, const base::DictionaryValue& value, - bool has_error) OVERRIDE; + bool has_error) override; virtual void OnNeedPrivetToken( PrivetURLFetcher* fetcher, - const PrivetURLFetcher::TokenCallback& callback) OVERRIDE; + const PrivetURLFetcher::TokenCallback& callback) override; private: PrivetHTTPClient* privet_client_; @@ -159,26 +159,26 @@ class PrivetDataReadOperationImpl : public PrivetDataReadOperation, const PrivetDataReadOperation::ResultCallback& callback); virtual ~PrivetDataReadOperationImpl(); - virtual void Start() OVERRIDE; + virtual void Start() override; - virtual void SetDataRange(int range_start, int range_end) OVERRIDE; + virtual void SetDataRange(int range_start, int range_end) override; - virtual void SaveDataToFile() OVERRIDE; + virtual void SaveDataToFile() override; - virtual PrivetHTTPClient* GetHTTPClient() OVERRIDE; + virtual PrivetHTTPClient* GetHTTPClient() override; virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) OVERRIDE; + PrivetURLFetcher::ErrorType error) override; virtual void OnParsedJson(PrivetURLFetcher* fetcher, const base::DictionaryValue& value, - bool has_error) OVERRIDE; + bool has_error) override; virtual void OnNeedPrivetToken( PrivetURLFetcher* fetcher, - const PrivetURLFetcher::TokenCallback& callback) OVERRIDE; + const PrivetURLFetcher::TokenCallback& callback) override; virtual bool OnRawData(PrivetURLFetcher* fetcher, bool is_file, const std::string& data_str, - const base::FilePath& file_path) OVERRIDE; + const base::FilePath& file_path) override; private: PrivetHTTPClient* privet_client_; @@ -203,36 +203,36 @@ class PrivetLocalPrintOperationImpl PrivetLocalPrintOperation::Delegate* delegate); virtual ~PrivetLocalPrintOperationImpl(); - virtual void Start() OVERRIDE; + virtual void Start() override; virtual void SetData( - const scoped_refptr<base::RefCountedBytes>& data) OVERRIDE; + const scoped_refptr<base::RefCountedBytes>& data) override; - virtual void SetCapabilities(const std::string& capabilities) OVERRIDE; + virtual void SetCapabilities(const std::string& capabilities) override; - virtual void SetTicket(const std::string& ticket) OVERRIDE; + virtual void SetTicket(const std::string& ticket) override; - virtual void SetUsername(const std::string& user) OVERRIDE; + virtual void SetUsername(const std::string& user) override; - virtual void SetJobname(const std::string& jobname) OVERRIDE; + virtual void SetJobname(const std::string& jobname) override; - virtual void SetOffline(bool offline) OVERRIDE; + virtual void SetOffline(bool offline) override; - virtual void SetPageSize(const gfx::Size& page_size) OVERRIDE; + virtual void SetPageSize(const gfx::Size& page_size) override; virtual void SetPWGRasterConverterForTesting( - scoped_ptr<PWGRasterConverter> pwg_raster_converter) OVERRIDE; + scoped_ptr<PWGRasterConverter> pwg_raster_converter) override; - virtual PrivetHTTPClient* GetHTTPClient() OVERRIDE; + virtual PrivetHTTPClient* GetHTTPClient() override; virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) OVERRIDE; + PrivetURLFetcher::ErrorType error) override; virtual void OnParsedJson(PrivetURLFetcher* fetcher, const base::DictionaryValue& value, - bool has_error) OVERRIDE; + bool has_error) override; virtual void OnNeedPrivetToken( PrivetURLFetcher* fetcher, - const PrivetURLFetcher::TokenCallback& callback) OVERRIDE; + const PrivetURLFetcher::TokenCallback& callback) override; private: typedef base::Callback<void(bool, const base::DictionaryValue* value)> @@ -295,15 +295,15 @@ class PrivetHTTPClientImpl : public PrivetHTTPClient { virtual ~PrivetHTTPClientImpl(); // PrivetHTTPClient implementation. - virtual const std::string& GetName() OVERRIDE; + virtual const std::string& GetName() override; virtual scoped_ptr<PrivetJSONOperation> CreateInfoOperation( - const PrivetJSONOperation::ResultCallback& callback) OVERRIDE; + const PrivetJSONOperation::ResultCallback& callback) override; virtual scoped_ptr<PrivetURLFetcher> CreateURLFetcher( const GURL& url, net::URLFetcher::RequestType request_type, - PrivetURLFetcher::Delegate* delegate) OVERRIDE; + PrivetURLFetcher::Delegate* delegate) override; virtual void RefreshPrivetToken( - const PrivetURLFetcher::TokenCallback& token_callback) OVERRIDE; + const PrivetURLFetcher::TokenCallback& token_callback) override; private: typedef std::vector<PrivetURLFetcher::TokenCallback> TokenCallbackVector; @@ -325,16 +325,16 @@ class PrivetV1HTTPClientImpl : public PrivetV1HTTPClient { explicit PrivetV1HTTPClientImpl(scoped_ptr<PrivetHTTPClient> info_client); virtual ~PrivetV1HTTPClientImpl(); - virtual const std::string& GetName() OVERRIDE; + virtual const std::string& GetName() override; virtual scoped_ptr<PrivetJSONOperation> CreateInfoOperation( - const PrivetJSONOperation::ResultCallback& callback) OVERRIDE; + const PrivetJSONOperation::ResultCallback& callback) override; virtual scoped_ptr<PrivetRegisterOperation> CreateRegisterOperation( const std::string& user, - PrivetRegisterOperation::Delegate* delegate) OVERRIDE; + PrivetRegisterOperation::Delegate* delegate) override; virtual scoped_ptr<PrivetJSONOperation> CreateCapabilitiesOperation( - const PrivetJSONOperation::ResultCallback& callback) OVERRIDE; + const PrivetJSONOperation::ResultCallback& callback) override; virtual scoped_ptr<PrivetLocalPrintOperation> CreateLocalPrintOperation( - PrivetLocalPrintOperation::Delegate* delegate) OVERRIDE; + PrivetLocalPrintOperation::Delegate* delegate) override; private: PrivetHTTPClient* info_client() { return info_client_.get(); } diff --git a/chrome/browser/local_discovery/privet_http_unittest.cc b/chrome/browser/local_discovery/privet_http_unittest.cc index 94c9bc7..1835024 100644 --- a/chrome/browser/local_discovery/privet_http_unittest.cc +++ b/chrome/browser/local_discovery/privet_http_unittest.cc @@ -382,7 +382,7 @@ class MockRegisterDelegate : public PrivetRegisterOperation::Delegate { virtual void OnPrivetRegisterClaimToken( PrivetRegisterOperation* operation, const std::string& token, - const GURL& url) OVERRIDE { + const GURL& url) override { OnPrivetRegisterClaimTokenInternal(token, url); } @@ -395,7 +395,7 @@ class MockRegisterDelegate : public PrivetRegisterOperation::Delegate { const std::string& action, PrivetRegisterOperation::FailureReason reason, int printer_http_code, - const base::DictionaryValue* json) OVERRIDE { + const base::DictionaryValue* json) override { // TODO(noamsml): Save and test for JSON? OnPrivetRegisterErrorInternal(action, reason, printer_http_code); } @@ -407,7 +407,7 @@ class MockRegisterDelegate : public PrivetRegisterOperation::Delegate { virtual void OnPrivetRegisterDone( PrivetRegisterOperation* operation, - const std::string& device_id) OVERRIDE { + const std::string& device_id) override { OnPrivetRegisterDoneInternal(device_id); } @@ -441,7 +441,7 @@ class PrivetInfoTest : public PrivetHTTPTest { virtual ~PrivetInfoTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { info_operation_ = privet_client_->CreateInfoOperation( info_callback_.callback()); } @@ -488,7 +488,7 @@ class PrivetRegisterTest : public PrivetHTTPTest { virtual ~PrivetRegisterTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { info_operation_ = privet_client_->CreateInfoOperation( info_callback_.callback()); register_operation_ = @@ -677,7 +677,7 @@ class PrivetCapabilitiesTest : public PrivetHTTPTest { virtual ~PrivetCapabilitiesTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { capabilities_operation_ = privet_client_->CreateCapabilitiesOperation( capabilities_callback_.callback()); } @@ -768,7 +768,7 @@ class FakePWGRasterConverter : public PWGRasterConverter { virtual void Start(base::RefCountedMemory* data, const printing::PdfRenderSettings& conversion_settings, const printing::PwgRasterSettings& bitmap_settings, - const ResultCallback& callback) OVERRIDE { + const ResultCallback& callback) override { bitmap_settings_ = bitmap_settings; std::string data_str(data->front_as<char>(), data->size()); callback.Run(true, base::FilePath().AppendASCII(data_str + "test.pdf")); @@ -788,7 +788,7 @@ class PrivetLocalPrintTest : public PrivetHTTPTest { virtual ~PrivetLocalPrintTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { PrivetURLFetcher::ResetTokenMapForTests(); local_print_operation_ = privet_client_->CreateLocalPrintOperation( diff --git a/chrome/browser/local_discovery/privet_local_printer_lister.h b/chrome/browser/local_discovery/privet_local_printer_lister.h index 6633206..037d7d1 100644 --- a/chrome/browser/local_discovery/privet_local_printer_lister.h +++ b/chrome/browser/local_discovery/privet_local_printer_lister.h @@ -47,9 +47,9 @@ class PrivetLocalPrinterLister : PrivetDeviceLister::Delegate { // PrivetDeviceLister::Delegate implementation. virtual void DeviceChanged(bool added, const std::string& name, - const DeviceDescription& description) OVERRIDE; - virtual void DeviceRemoved(const std::string& name) OVERRIDE; - virtual void DeviceCacheFlushed() OVERRIDE; + const DeviceDescription& description) override; + virtual void DeviceRemoved(const std::string& name) override; + virtual void DeviceCacheFlushed() override; private: struct DeviceContext; diff --git a/chrome/browser/local_discovery/privet_notifications.h b/chrome/browser/local_discovery/privet_notifications.h index 527db0a..646eff3 100644 --- a/chrome/browser/local_discovery/privet_notifications.h +++ b/chrome/browser/local_discovery/privet_notifications.h @@ -99,14 +99,14 @@ class PrivetNotificationService // PrivetDeviceLister::Delegate implementation: virtual void DeviceChanged(bool added, const std::string& name, - const DeviceDescription& description) OVERRIDE; - virtual void DeviceRemoved(const std::string& name) OVERRIDE; + const DeviceDescription& description) override; + virtual void DeviceRemoved(const std::string& name) override; // PrivetNotificationListener::Delegate implementation: - virtual void PrivetNotify(bool has_multiple, bool added) OVERRIDE; + virtual void PrivetNotify(bool has_multiple, bool added) override; - virtual void PrivetRemoveNotification() OVERRIDE; - virtual void DeviceCacheFlushed() OVERRIDE; + virtual void PrivetRemoveNotification() override; + virtual void DeviceCacheFlushed() override; static bool IsEnabled(); static bool IsForced(); @@ -132,13 +132,13 @@ class PrivetNotificationDelegate : public NotificationDelegate { explicit PrivetNotificationDelegate(content::BrowserContext* profile); // NotificationDelegate implementation. - virtual std::string id() const OVERRIDE; - virtual content::WebContents* GetWebContents() const OVERRIDE; - virtual void Display() OVERRIDE; - virtual void Error() OVERRIDE; - virtual void Close(bool by_user) OVERRIDE; - virtual void Click() OVERRIDE; - virtual void ButtonClick(int button_index) OVERRIDE; + virtual std::string id() const override; + virtual content::WebContents* GetWebContents() const override; + virtual void Display() override; + virtual void Error() override; + virtual void Close(bool by_user) override; + virtual void Click() override; + virtual void ButtonClick(int button_index) override; private: void OpenTab(const GURL& url); diff --git a/chrome/browser/local_discovery/privet_notifications_factory.h b/chrome/browser/local_discovery/privet_notifications_factory.h index 636ce69..b6d62d3 100644 --- a/chrome/browser/local_discovery/privet_notifications_factory.h +++ b/chrome/browser/local_discovery/privet_notifications_factory.h @@ -24,9 +24,9 @@ class PrivetNotificationServiceFactory // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* profile) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; }; } // namespace local_discovery diff --git a/chrome/browser/local_discovery/privet_notifications_unittest.cc b/chrome/browser/local_discovery/privet_notifications_unittest.cc index 2cdcf71..a6e8a0d 100644 --- a/chrome/browser/local_discovery/privet_notifications_unittest.cc +++ b/chrome/browser/local_discovery/privet_notifications_unittest.cc @@ -51,12 +51,12 @@ class MockPrivetHttpFactory : public PrivetHTTPAsynchronousFactory { virtual ~MockResolution() { } - virtual void Start() OVERRIDE { + virtual void Start() override { callback_.Run(scoped_ptr<PrivetHTTPClient>(new PrivetHTTPClientImpl( name_, net::HostPortPair("1.2.3.4", 8080), request_context_.get()))); } - virtual const std::string& GetName() OVERRIDE { + virtual const std::string& GetName() override { return name_; } @@ -73,7 +73,7 @@ class MockPrivetHttpFactory : public PrivetHTTPAsynchronousFactory { virtual scoped_ptr<PrivetHTTPResolution> CreatePrivetHTTP( const std::string& name, const net::HostPortPair& address, - const ResultCallback& callback) OVERRIDE { + const ResultCallback& callback) override { return scoped_ptr<PrivetHTTPResolution>( new MockResolution(name, request_context_.get(), callback)); } diff --git a/chrome/browser/local_discovery/privet_traffic_detector.h b/chrome/browser/local_discovery/privet_traffic_detector.h index 1cbf3fb..32a5b09 100644 --- a/chrome/browser/local_discovery/privet_traffic_detector.h +++ b/chrome/browser/local_discovery/privet_traffic_detector.h @@ -41,7 +41,7 @@ class PrivetTrafficDetector // net::NetworkChangeNotifier::NetworkChangeObserver implementation. virtual void OnNetworkChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; + net::NetworkChangeNotifier::ConnectionType type) override; void StartOnIOThread(); void ScheduleRestart(); diff --git a/chrome/browser/local_discovery/privet_url_fetcher.h b/chrome/browser/local_discovery/privet_url_fetcher.h index a4c4108..8bae4a7 100644 --- a/chrome/browser/local_discovery/privet_url_fetcher.h +++ b/chrome/browser/local_discovery/privet_url_fetcher.h @@ -74,7 +74,7 @@ class PrivetURLFetcher : public net::URLFetcherDelegate { virtual ~PrivetURLFetcher(); // net::URLFetcherDelegate methods. - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; static void SetTokenForHost(const std::string& host, const std::string& token); diff --git a/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc b/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc index 45d1edd..5d07b8a 100644 --- a/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc +++ b/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc @@ -32,7 +32,7 @@ class MockPrivetURLFetcherDelegate : public PrivetURLFetcher::Delegate { } virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) OVERRIDE { + PrivetURLFetcher::ErrorType error) override { OnErrorInternal(error); } @@ -40,7 +40,7 @@ class MockPrivetURLFetcherDelegate : public PrivetURLFetcher::Delegate { virtual void OnParsedJson(PrivetURLFetcher* fetcher, const base::DictionaryValue& value, - bool has_error) OVERRIDE { + bool has_error) override { saved_value_.reset(value.DeepCopy()); OnParsedJsonInternal(has_error); } diff --git a/chrome/browser/local_discovery/privetv3_crypto_provider.cc b/chrome/browser/local_discovery/privetv3_crypto_provider.cc index df27aa6..12bbcc8 100644 --- a/chrome/browser/local_discovery/privetv3_crypto_provider.cc +++ b/chrome/browser/local_discovery/privetv3_crypto_provider.cc @@ -23,16 +23,16 @@ class PrivetV3CryptoProviderEmpty : public PrivetV3CryptoProvider { virtual ~PrivetV3CryptoProviderEmpty(); // PrivetV3CryptoProvider implementation. - virtual HandshakeState GetState() OVERRIDE; - virtual std::string GetAuthMethod() OVERRIDE; - virtual HandshakeState GetNextStep(int* step, std::string* package) OVERRIDE; + virtual HandshakeState GetState() override; + virtual std::string GetAuthMethod() override; + virtual HandshakeState GetNextStep(int* step, std::string* package) override; virtual HandshakeState SetStepResponse(int step, const std::string& state, - const std::string& package) OVERRIDE; - virtual std::string GetVerificationCode() OVERRIDE; - virtual HandshakeState AcceptVerificationCode() OVERRIDE; + const std::string& package) override; + virtual std::string GetVerificationCode() override; + virtual HandshakeState AcceptVerificationCode() override; virtual bool EncryptData(const std::string& input, - std::string* output) OVERRIDE; + std::string* output) override; private: HandshakeState state_; diff --git a/chrome/browser/local_discovery/privetv3_session.cc b/chrome/browser/local_discovery/privetv3_session.cc index d3bbb96d..2a2775f 100644 --- a/chrome/browser/local_discovery/privetv3_session.cc +++ b/chrome/browser/local_discovery/privetv3_session.cc @@ -36,12 +36,12 @@ class PrivetV3Session::FetcherDelegate : public PrivetURLFetcher::Delegate { // PrivetURLFetcher::Delegate methods. virtual void OnNeedPrivetToken( PrivetURLFetcher* fetcher, - const PrivetURLFetcher::TokenCallback& callback) OVERRIDE; + const PrivetURLFetcher::TokenCallback& callback) override; virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) OVERRIDE; + PrivetURLFetcher::ErrorType error) override; virtual void OnParsedJson(PrivetURLFetcher* fetcher, const base::DictionaryValue& value, - bool has_error) OVERRIDE; + bool has_error) override; private: friend class PrivetV3Session; diff --git a/chrome/browser/local_discovery/privetv3_session_unittest.cc b/chrome/browser/local_discovery/privetv3_session_unittest.cc index fd117a4..1c9f845 100644 --- a/chrome/browser/local_discovery/privetv3_session_unittest.cc +++ b/chrome/browser/local_discovery/privetv3_session_unittest.cc @@ -44,7 +44,7 @@ class PrivetV3SessionTest : public testing::Test { } protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { quit_closure_ = run_loop_.QuitClosure(); EXPECT_CALL(delegate_, OnSetupConfirmationNeeded(_, _)).Times(0); EXPECT_CALL(delegate_, OnSessionStatus(_)).Times(0); diff --git a/chrome/browser/local_discovery/privetv3_setup_flow.cc b/chrome/browser/local_discovery/privetv3_setup_flow.cc index 64142d7..9f3554f 100644 --- a/chrome/browser/local_discovery/privetv3_setup_flow.cc +++ b/chrome/browser/local_discovery/privetv3_setup_flow.cc @@ -21,12 +21,12 @@ class SetupRequest : public PrivetV3Session::Request { explicit SetupRequest(PrivetV3SetupFlow* setup_flow); virtual ~SetupRequest(); - virtual std::string GetName() OVERRIDE { return "/privet/v3/setup/start"; } - virtual const base::DictionaryValue& GetInput() OVERRIDE; + virtual std::string GetName() override { return "/privet/v3/setup/start"; } + virtual const base::DictionaryValue& GetInput() override; - virtual void OnError(PrivetURLFetcher::ErrorType error) OVERRIDE; + virtual void OnError(PrivetURLFetcher::ErrorType error) override; virtual void OnParsedJson(const base::DictionaryValue& value, - bool has_error) OVERRIDE; + bool has_error) override; void SetWiFiCridentials(const std::string& ssid, const std::string& password); diff --git a/chrome/browser/local_discovery/privetv3_setup_flow.h b/chrome/browser/local_discovery/privetv3_setup_flow.h index f53e506..925ee8a 100644 --- a/chrome/browser/local_discovery/privetv3_setup_flow.h +++ b/chrome/browser/local_discovery/privetv3_setup_flow.h @@ -75,9 +75,9 @@ class PrivetV3SetupFlow : public PrivetV3Session::Delegate { virtual void OnSetupConfirmationNeeded( const std::string& confirmation_code, extensions::api::gcd_private::ConfirmationType confirmation_type) - OVERRIDE; + override; virtual void OnSessionStatus( - extensions::api::gcd_private::Status status) OVERRIDE; + extensions::api::gcd_private::Status status) override; void OnSetupError(); void OnDeviceRegistered(); diff --git a/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc b/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc index 538acfc..d25f982 100644 --- a/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc +++ b/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc @@ -47,19 +47,19 @@ class MockPrivetHTTPClient : public PrivetHTTPClient { PrivetJSONOperation*(const PrivetJSONOperation::ResultCallback&)); virtual void RefreshPrivetToken( - const PrivetURLFetcher::TokenCallback& callback) OVERRIDE { + const PrivetURLFetcher::TokenCallback& callback) override { callback.Run("x-privet-token"); } virtual scoped_ptr<PrivetJSONOperation> CreateInfoOperation( - const PrivetJSONOperation::ResultCallback& callback) OVERRIDE { + const PrivetJSONOperation::ResultCallback& callback) override { return make_scoped_ptr(CreateInfoOperationPtr(callback)); } virtual scoped_ptr<PrivetURLFetcher> CreateURLFetcher( const GURL& url, net::URLFetcher::RequestType request_type, - PrivetURLFetcher::Delegate* delegate) OVERRIDE { + PrivetURLFetcher::Delegate* delegate) override { return make_scoped_ptr(new PrivetURLFetcher( url, request_type, request_context_.get(), delegate)); } @@ -75,7 +75,7 @@ class MockDelegate : public PrivetV3SetupFlow::Delegate { public: explicit MockGCDApiFlow(MockDelegate* delegate) : delegate_(delegate) {} - virtual void Start(scoped_ptr<Request> request) OVERRIDE { + virtual void Start(scoped_ptr<Request> request) override { ASSERT_FALSE(delegate_->gcd_request_); delegate_->gcd_request_ = request.Pass(); delegate_->ReplyWithToken(); @@ -89,7 +89,7 @@ class MockDelegate : public PrivetV3SetupFlow::Delegate { MOCK_METHOD1(SwitchToSetupWiFi, void(const ResultCallback&)); virtual void CreatePrivetV3Client( const std::string& service_name, - const PrivetClientCallback& callback) OVERRIDE { + const PrivetClientCallback& callback) override { scoped_ptr<MockPrivetHTTPClient> privet_client(new MockPrivetHTTPClient()); privet_client_ptr_ = privet_client.get(); callback.Run(privet_client.PassAs<PrivetHTTPClient>()); @@ -100,7 +100,7 @@ class MockDelegate : public PrivetV3SetupFlow::Delegate { MOCK_METHOD0(OnSetupDone, void()); MOCK_METHOD0(OnSetupError, void()); - virtual scoped_ptr<GCDApiFlow> CreateApiFlow() OVERRIDE { + virtual scoped_ptr<GCDApiFlow> CreateApiFlow() override { scoped_ptr<MockGCDApiFlow> mock_gcd(new MockGCDApiFlow(this)); return mock_gcd.PassAs<GCDApiFlow>(); } @@ -130,7 +130,7 @@ class PrivetV3SetupFlowTest : public testing::Test { } protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { quit_closure_ = run_loop_.QuitClosure(); EXPECT_CALL(delegate_, GetWiFiCredentials(_)).Times(0); EXPECT_CALL(delegate_, SwitchToSetupWiFi(_)).Times(0); diff --git a/chrome/browser/local_discovery/pwg_raster_converter.cc b/chrome/browser/local_discovery/pwg_raster_converter.cc index f0edb347..75b6756 100644 --- a/chrome/browser/local_discovery/pwg_raster_converter.cc +++ b/chrome/browser/local_discovery/pwg_raster_converter.cc @@ -109,8 +109,8 @@ class PwgUtilityProcessHostClient : public content::UtilityProcessHostClient { const PWGRasterConverter::ResultCallback& callback); // UtilityProcessHostClient implementation. - virtual void OnProcessCrashed(int exit_code) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnProcessCrashed(int exit_code) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: virtual ~PwgUtilityProcessHostClient(); @@ -248,7 +248,7 @@ class PWGRasterConverterImpl : public PWGRasterConverter { virtual void Start(base::RefCountedMemory* data, const printing::PdfRenderSettings& conversion_settings, const printing::PwgRasterSettings& bitmap_settings, - const ResultCallback& callback) OVERRIDE; + const ResultCallback& callback) override; private: scoped_refptr<PwgUtilityProcessHostClient> utility_client_; diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.h b/chrome/browser/local_discovery/service_discovery_client_mac.h index 4532e5e..bc67de4 100644 --- a/chrome/browser/local_discovery/service_discovery_client_mac.h +++ b/chrome/browser/local_discovery/service_discovery_client_mac.h @@ -37,14 +37,14 @@ class ServiceDiscoveryClientMac : public ServiceDiscoverySharedClient { // ServiceDiscoveryClient implementation. virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher( const std::string& service_type, - const ServiceWatcher::UpdatedCallback& callback) OVERRIDE; + const ServiceWatcher::UpdatedCallback& callback) override; virtual scoped_ptr<ServiceResolver> CreateServiceResolver( const std::string& service_name, - const ServiceResolver::ResolveCompleteCallback& callback) OVERRIDE; + const ServiceResolver::ResolveCompleteCallback& callback) override; virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver( const std::string& domain, net::AddressFamily address_family, - const LocalDomainResolver::IPAddressCallback& callback) OVERRIDE; + const LocalDomainResolver::IPAddressCallback& callback) override; void StartThreadIfNotStarted(); @@ -102,11 +102,11 @@ class ServiceWatcherImplMac : public ServiceWatcher { private: virtual ~ServiceWatcherImplMac(); - virtual void Start() OVERRIDE; - virtual void DiscoverNewServices(bool force_update) OVERRIDE; + virtual void Start() override; + virtual void DiscoverNewServices(bool force_update) override; virtual void SetActivelyRefreshServices( - bool actively_refresh_services) OVERRIDE; - virtual std::string GetServiceType() const OVERRIDE; + bool actively_refresh_services) override; + virtual std::string GetServiceType() const override; std::string service_type_; ServiceWatcher::UpdatedCallback callback_; @@ -170,8 +170,8 @@ class ServiceResolverImplMac : public ServiceResolver { private: virtual ~ServiceResolverImplMac(); - virtual void StartResolving() OVERRIDE; - virtual std::string GetName() const OVERRIDE; + virtual void StartResolving() override; + virtual std::string GetName() const override; void OnResolveComplete(RequestStatus status, const ServiceDescription& description); diff --git a/chrome/browser/local_discovery/service_discovery_client_mdns.cc b/chrome/browser/local_discovery/service_discovery_client_mdns.cc index 0016eb4..9834b05 100644 --- a/chrome/browser/local_discovery/service_discovery_client_mdns.cc +++ b/chrome/browser/local_discovery/service_discovery_client_mdns.cc @@ -112,7 +112,7 @@ class SocketFactory : public net::MDnsSocketFactory { // net::MDnsSocketFactory implementation: virtual void CreateSockets( - ScopedVector<net::DatagramServerSocket>* sockets) OVERRIDE { + ScopedVector<net::DatagramServerSocket>* sockets) override { for (size_t i = 0; i < interfaces_.size(); ++i) { DCHECK(interfaces_[i].second == net::ADDRESS_FAMILY_IPV4 || interfaces_[i].second == net::ADDRESS_FAMILY_IPV6); @@ -149,11 +149,11 @@ class ProxyBase : public ServiceDiscoveryClientMdns::Proxy, public T { DeleteOnMdnsThread(implementation_.release()); } - virtual bool IsValid() OVERRIDE { + virtual bool IsValid() override { return !!implementation(); } - virtual void OnMdnsDestroy() OVERRIDE { + virtual void OnMdnsDestroy() override { DeleteOnMdnsThread(implementation_.release()); }; @@ -187,14 +187,14 @@ class ServiceWatcherProxy : public ProxyBase<ServiceWatcher> { } // ServiceWatcher methods. - virtual void Start() OVERRIDE { + virtual void Start() override { if (implementation()) { PostToMdnsThread(base::Bind(&ServiceWatcher::Start, base::Unretained(implementation()))); } } - virtual void DiscoverNewServices(bool force_update) OVERRIDE { + virtual void DiscoverNewServices(bool force_update) override { if (implementation()) { PostToMdnsThread(base::Bind(&ServiceWatcher::DiscoverNewServices, base::Unretained(implementation()), @@ -203,7 +203,7 @@ class ServiceWatcherProxy : public ProxyBase<ServiceWatcher> { } virtual void SetActivelyRefreshServices( - bool actively_refresh_services) OVERRIDE { + bool actively_refresh_services) override { if (implementation()) { PostToMdnsThread(base::Bind(&ServiceWatcher::SetActivelyRefreshServices, base::Unretained(implementation()), @@ -211,11 +211,11 @@ class ServiceWatcherProxy : public ProxyBase<ServiceWatcher> { } } - virtual std::string GetServiceType() const OVERRIDE { + virtual std::string GetServiceType() const override { return service_type_; } - virtual void OnNewMdnsReady() OVERRIDE { + virtual void OnNewMdnsReady() override { ProxyBase<ServiceWatcher>::OnNewMdnsReady(); if (!implementation()) callback_.Run(ServiceWatcher::UPDATE_INVALIDATED, ""); @@ -250,14 +250,14 @@ class ServiceResolverProxy : public ProxyBase<ServiceResolver> { } // ServiceResolver methods. - virtual void StartResolving() OVERRIDE { + virtual void StartResolving() override { if (implementation()) { PostToMdnsThread(base::Bind(&ServiceResolver::StartResolving, base::Unretained(implementation()))); } }; - virtual std::string GetName() const OVERRIDE { + virtual std::string GetName() const override { return service_name_; } @@ -294,7 +294,7 @@ class LocalDomainResolverProxy : public ProxyBase<LocalDomainResolver> { } // LocalDomainResolver methods. - virtual void Start() OVERRIDE { + virtual void Start() override { if (implementation()) { PostToMdnsThread(base::Bind(&LocalDomainResolver::Start, base::Unretained(implementation()))); diff --git a/chrome/browser/local_discovery/service_discovery_client_mdns.h b/chrome/browser/local_discovery/service_discovery_client_mdns.h index 4a2b467..3d0ba68 100644 --- a/chrome/browser/local_discovery/service_discovery_client_mdns.h +++ b/chrome/browser/local_discovery/service_discovery_client_mdns.h @@ -29,18 +29,18 @@ class ServiceDiscoveryClientMdns // ServiceDiscoveryClient implementation. virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher( const std::string& service_type, - const ServiceWatcher::UpdatedCallback& callback) OVERRIDE; + const ServiceWatcher::UpdatedCallback& callback) override; virtual scoped_ptr<ServiceResolver> CreateServiceResolver( const std::string& service_name, - const ServiceResolver::ResolveCompleteCallback& callback) OVERRIDE; + const ServiceResolver::ResolveCompleteCallback& callback) override; virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver( const std::string& domain, net::AddressFamily address_family, - const LocalDomainResolver::IPAddressCallback& callback) OVERRIDE; + const LocalDomainResolver::IPAddressCallback& callback) override; // net::NetworkChangeNotifier::NetworkChangeObserver implementation. virtual void OnNetworkChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; + net::NetworkChangeNotifier::ConnectionType type) override; private: virtual ~ServiceDiscoveryClientMdns(); diff --git a/chrome/browser/local_discovery/service_discovery_client_utility.h b/chrome/browser/local_discovery/service_discovery_client_utility.h index beb3f2e..0b309f7 100644 --- a/chrome/browser/local_discovery/service_discovery_client_utility.h +++ b/chrome/browser/local_discovery/service_discovery_client_utility.h @@ -27,18 +27,18 @@ class ServiceDiscoveryClientUtility // ServiceDiscoveryClient implementation. virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher( const std::string& service_type, - const ServiceWatcher::UpdatedCallback& callback) OVERRIDE; + const ServiceWatcher::UpdatedCallback& callback) override; virtual scoped_ptr<ServiceResolver> CreateServiceResolver( const std::string& service_name, - const ServiceResolver::ResolveCompleteCallback& callback) OVERRIDE; + const ServiceResolver::ResolveCompleteCallback& callback) override; virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver( const std::string& domain, net::AddressFamily address_family, - const LocalDomainResolver::IPAddressCallback& callback) OVERRIDE; + const LocalDomainResolver::IPAddressCallback& callback) override; // net::NetworkChangeNotifier::NetworkChangeObserver implementation. virtual void OnNetworkChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; + net::NetworkChangeNotifier::ConnectionType type) override; private: friend class base::RefCounted<ServiceDiscoveryClientUtility>; diff --git a/chrome/browser/local_discovery/service_discovery_host_client.cc b/chrome/browser/local_discovery/service_discovery_host_client.cc index 8b75fc6..78d001c 100644 --- a/chrome/browser/local_discovery/service_discovery_host_client.cc +++ b/chrome/browser/local_discovery/service_discovery_host_client.cc @@ -69,28 +69,28 @@ class ServiceDiscoveryHostClient::ServiceWatcherProxy : public ServiceWatcher { host_->Send(new LocalDiscoveryMsg_DestroyWatcher(id_)); } - virtual void Start() OVERRIDE { + virtual void Start() override { DVLOG(1) << "ServiceWatcher::Start with id " << id_; DCHECK(!started_); host_->Send(new LocalDiscoveryMsg_StartWatcher(id_, service_type_)); started_ = true; } - virtual void DiscoverNewServices(bool force_update) OVERRIDE { + virtual void DiscoverNewServices(bool force_update) override { DVLOG(1) << "ServiceWatcher::DiscoverNewServices with id " << id_; DCHECK(started_); host_->Send(new LocalDiscoveryMsg_DiscoverServices(id_, force_update)); } virtual void SetActivelyRefreshServices( - bool actively_refresh_services) OVERRIDE { + bool actively_refresh_services) override { DVLOG(1) << "ServiceWatcher::SetActivelyRefreshServices with id " << id_; DCHECK(started_); host_->Send(new LocalDiscoveryMsg_SetActivelyRefreshServices( id_, actively_refresh_services)); } - virtual std::string GetServiceType() const OVERRIDE { + virtual std::string GetServiceType() const override { return service_type_; } @@ -120,14 +120,14 @@ class ServiceDiscoveryHostClient::ServiceResolverProxy host_->Send(new LocalDiscoveryMsg_DestroyResolver(id_)); } - virtual void StartResolving() OVERRIDE { + virtual void StartResolving() override { DVLOG(1) << "ServiceResolverProxy::StartResolving with id " << id_; DCHECK(!started_); host_->Send(new LocalDiscoveryMsg_ResolveService(id_, service_name_)); started_ = true; } - virtual std::string GetName() const OVERRIDE { + virtual std::string GetName() const override { return service_name_; } @@ -159,7 +159,7 @@ class ServiceDiscoveryHostClient::LocalDomainResolverProxy host_->Send(new LocalDiscoveryMsg_DestroyLocalDomainResolver(id_)); } - virtual void Start() OVERRIDE { + virtual void Start() override { DVLOG(1) << "LocalDomainResolverProxy::Start with id " << id_; DCHECK(!started_); host_->Send(new LocalDiscoveryMsg_ResolveLocalDomain(id_, domain_, diff --git a/chrome/browser/local_discovery/service_discovery_host_client.h b/chrome/browser/local_discovery/service_discovery_host_client.h index 330418c..ce16e43 100644 --- a/chrome/browser/local_discovery/service_discovery_host_client.h +++ b/chrome/browser/local_discovery/service_discovery_host_client.h @@ -48,18 +48,18 @@ class ServiceDiscoveryHostClient // ServiceDiscoveryClient implementation. virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher( const std::string& service_type, - const ServiceWatcher::UpdatedCallback& callback) OVERRIDE; + const ServiceWatcher::UpdatedCallback& callback) override; virtual scoped_ptr<ServiceResolver> CreateServiceResolver( const std::string& service_name, - const ServiceResolver::ResolveCompleteCallback& callback) OVERRIDE; + const ServiceResolver::ResolveCompleteCallback& callback) override; virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver( const std::string& domain, net::AddressFamily address_family, - const LocalDomainResolver::IPAddressCallback& callback) OVERRIDE; + const LocalDomainResolver::IPAddressCallback& callback) override; // UtilityProcessHostClient implementation. - virtual void OnProcessCrashed(int exit_code) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnProcessCrashed(int exit_code) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; protected: virtual ~ServiceDiscoveryHostClient(); diff --git a/chrome/browser/local_discovery/test_service_discovery_client.h b/chrome/browser/local_discovery/test_service_discovery_client.h index 92a14d9..28836d4 100644 --- a/chrome/browser/local_discovery/test_service_discovery_client.h +++ b/chrome/browser/local_discovery/test_service_discovery_client.h @@ -21,14 +21,14 @@ class TestServiceDiscoveryClient : public ServiceDiscoverySharedClient { virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher( const std::string& service_type, - const ServiceWatcher::UpdatedCallback& callback) OVERRIDE; + const ServiceWatcher::UpdatedCallback& callback) override; virtual scoped_ptr<ServiceResolver> CreateServiceResolver( const std::string& service_name, - const ServiceResolver::ResolveCompleteCallback& callback) OVERRIDE; + const ServiceResolver::ResolveCompleteCallback& callback) override; virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver( const std::string& domain, net::AddressFamily address_family, - const LocalDomainResolver::IPAddressCallback& callback) OVERRIDE; + const LocalDomainResolver::IPAddressCallback& callback) override; MOCK_METHOD1(OnSendTo, void(const std::string& data)); diff --git a/chrome/browser/local_discovery/wifi/bootstrapping_device_lister.h b/chrome/browser/local_discovery/wifi/bootstrapping_device_lister.h index dfcc9a9..5c2dd28 100644 --- a/chrome/browser/local_discovery/wifi/bootstrapping_device_lister.h +++ b/chrome/browser/local_discovery/wifi/bootstrapping_device_lister.h @@ -52,7 +52,7 @@ class BootstrappingDeviceLister : public NetworkListObserver { ActiveDeviceList; virtual void OnNetworkListChanged( - const std::vector<NetworkProperties>& ssids) OVERRIDE; + const std::vector<NetworkProperties>& ssids) override; void UpdateChangedSSIDs(bool available, const ActiveDeviceList& changed, diff --git a/chrome/browser/local_discovery/wifi/credential_getter_win.h b/chrome/browser/local_discovery/wifi/credential_getter_win.h index ea7d896..4b28aca 100644 --- a/chrome/browser/local_discovery/wifi/credential_getter_win.h +++ b/chrome/browser/local_discovery/wifi/credential_getter_win.h @@ -27,9 +27,9 @@ class CredentialGetterWin : public content::UtilityProcessHostClient { private: // 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); diff --git a/chrome/browser/local_discovery/wifi/mock_wifi_manager.h b/chrome/browser/local_discovery/wifi/mock_wifi_manager.h index 589abe7..80cecb3fd 100644 --- a/chrome/browser/local_discovery/wifi/mock_wifi_manager.h +++ b/chrome/browser/local_discovery/wifi/mock_wifi_manager.h @@ -20,7 +20,7 @@ class MockWifiManager : public WifiManager { MOCK_METHOD0(Start, void()); - virtual void GetSSIDList(const SSIDListCallback& callback) OVERRIDE; + virtual void GetSSIDList(const SSIDListCallback& callback) override; MOCK_METHOD0(GetSSIDListInternal, void()); @@ -31,7 +31,7 @@ class MockWifiManager : public WifiManager { virtual void ConfigureAndConnectNetwork( const std::string& ssid, const WifiCredentials& credentials, - const SuccessCallback& callback) OVERRIDE; + const SuccessCallback& callback) override; MOCK_METHOD2(ConfigureAndConnectNetworkInternal, void(const std::string& ssid, const std::string& password)); @@ -39,7 +39,7 @@ class MockWifiManager : public WifiManager { void CallConfigureAndConnectNetworkCallback(bool success); virtual void ConnectToNetworkByID(const std::string& internal_id, - const SuccessCallback& callback) OVERRIDE; + const SuccessCallback& callback) override; MOCK_METHOD1(ConnectToNetworkByIDInternal, void(const std::string& internal_id)); @@ -48,7 +48,7 @@ class MockWifiManager : public WifiManager { virtual void RequestNetworkCredentials( const std::string& internal_id, - const CredentialsCallback& callback) OVERRIDE; + const CredentialsCallback& callback) override; MOCK_METHOD1(RequestNetworkCredentialsInternal, void(const std::string& internal_id)); @@ -78,7 +78,7 @@ class MockWifiManagerFactory : public WifiManagerFactory { MockWifiManagerFactory(); virtual ~MockWifiManagerFactory(); - virtual scoped_ptr<WifiManager> CreateWifiManager() OVERRIDE; + virtual scoped_ptr<WifiManager> CreateWifiManager() override; MockWifiManager* GetLastCreatedWifiManager(); diff --git a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc index 5660007..8077c3a 100644 --- a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc +++ b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc @@ -80,7 +80,7 @@ class WifiManagerNonChromeos::WifiServiceWrapper private: // net::NetworkChangeNotifier::NetworkChangeObserver implementation. virtual void OnNetworkChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; + net::NetworkChangeNotifier::ConnectionType type) override; void GetSSIDListInternal(NetworkPropertiesList* ssid_list); diff --git a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h index 008bd19..61b9d6b 100644 --- a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h +++ b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h @@ -25,21 +25,21 @@ class WifiManagerNonChromeos : public WifiManager { virtual ~WifiManagerNonChromeos(); // WifiManager implementation. - virtual void Start() OVERRIDE; - virtual void GetSSIDList(const SSIDListCallback& callback) OVERRIDE; - virtual void RequestScan() OVERRIDE; + virtual void Start() override; + virtual void GetSSIDList(const SSIDListCallback& callback) override; + virtual void RequestScan() override; virtual void ConfigureAndConnectNetwork( const std::string& ssid, const WifiCredentials& credentials, - const SuccessCallback& callback) OVERRIDE; + const SuccessCallback& callback) override; virtual void ConnectToNetworkByID(const std::string& internal_id, - const SuccessCallback& callback) OVERRIDE; + const SuccessCallback& callback) override; virtual void RequestNetworkCredentials( const std::string& ssid, - const CredentialsCallback& callback) OVERRIDE; - virtual void AddNetworkListObserver(NetworkListObserver* observer) OVERRIDE; + const CredentialsCallback& callback) override; + virtual void AddNetworkListObserver(NetworkListObserver* observer) override; virtual void RemoveNetworkListObserver( - NetworkListObserver* observer) OVERRIDE; + NetworkListObserver* observer) override; private: class WifiServiceWrapper; diff --git a/chrome/browser/locale_tests_browsertest.cc b/chrome/browser/locale_tests_browsertest.cc index c0b9197..1323159 100644 --- a/chrome/browser/locale_tests_browsertest.cc +++ b/chrome/browser/locale_tests_browsertest.cc @@ -69,7 +69,7 @@ class LocaleTestBase : public InProcessBrowserTest { explicit LocaleTestBase(const char* locale) : locale_(locale) { } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitchASCII(switches::kLang, locale_.locale()); } diff --git a/chrome/browser/media/cast_transport_host_filter.h b/chrome/browser/media/cast_transport_host_filter.h index 865d879..3a419cc5 100644 --- a/chrome/browser/media/cast_transport_host_filter.h +++ b/chrome/browser/media/cast_transport_host_filter.h @@ -40,7 +40,7 @@ class CastTransportHostFilter : public content::BrowserMessageFilter { const media::cast::RtcpCastMessage& cast_message); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // Forwarding functions. void OnInitializeAudio( diff --git a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc index 81714d2..ba6fded 100644 --- a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc +++ b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc @@ -37,7 +37,7 @@ class MediaStreamInfoBarTest : public WebRtcTestBase { virtual ~MediaStreamInfoBarTest() {} // InProcessBrowserTest: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // This test expects to run with fake devices but real UI. command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream)) diff --git a/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc index 8889f6a..863887c 100644 --- a/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc @@ -48,7 +48,7 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase { firefox_(base::kNullProcessHandle) { } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream)); // The video playback will not work without a GPU, so force its use here. @@ -57,7 +57,7 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase { switches::kUseFakeDeviceForMediaStream); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Kill any processes we may have brought up. LOG(INFO) << "Entering TearDown"; if (dev_appserver_ != base::kNullProcessHandle) diff --git a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc index 237998e..6e3671a 100644 --- a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc @@ -109,11 +109,11 @@ static const char kMainWebrtcTestHtmlPage[] = class WebRtcAudioQualityBrowserTest : public WebRtcTestBase { public: WebRtcAudioQualityBrowserTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { DetectErrorsInJavaScript(); // Look for errors in our rather complex js. } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // This test expects real device handling and requires a real webcam / audio // device; it will not work with fake devices. EXPECT_FALSE(command_line->HasSwitch( diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc index cbe994d..8000da0 100644 --- a/chrome/browser/media/chrome_webrtc_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_browsertest.cc @@ -24,11 +24,11 @@ static const char kMainWebrtcTestHtmlPage[] = // system. class WebRtcBrowserTest : public WebRtcTestBase { public: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { DetectErrorsInJavaScript(); // Look for errors in our rather complex js. } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Ensure the infobar is enabled, since we expect that in this test. EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream)); diff --git a/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc b/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc index a8f64c0..e6210f7 100644 --- a/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc @@ -31,11 +31,11 @@ class WebRtcDisableEncryptionFlagBrowserTest : public WebRtcTestBase { WebRtcDisableEncryptionFlagBrowserTest() {} virtual ~WebRtcDisableEncryptionFlagBrowserTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { DetectErrorsInJavaScript(); // Look for errors in our rather complex js. } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // This test should run with fake devices. command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); diff --git a/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc b/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc index 00e347e..7510841 100644 --- a/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc @@ -43,11 +43,11 @@ class WebRtcGetMediaDevicesBrowserTest : has_audio_output_devices_initialized_(false), has_audio_output_devices_(false) {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { DetectErrorsInJavaScript(); // Look for errors in our rather complex js. } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Ensure the infobar is enabled, since we expect that in this test. EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream)); diff --git a/chrome/browser/media/chrome_webrtc_perf_browsertest.cc b/chrome/browser/media/chrome_webrtc_perf_browsertest.cc index 368bad9..ed21ee6 100644 --- a/chrome/browser/media/chrome_webrtc_perf_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_perf_browsertest.cc @@ -33,11 +33,11 @@ static const char kMainWebrtcTestHtmlPage[] = // solution (which is only available on WebRTC internal bots). class WebRtcPerfBrowserTest : public WebRtcTestBase { public: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { DetectErrorsInJavaScript(); // Look for errors in our rather complex js. } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Ensure the infobar is enabled, since we expect that in this test. EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream)); diff --git a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc index f74a035..3961d35 100644 --- a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc @@ -102,13 +102,13 @@ class WebRtcVideoQualityBrowserTest : public WebRtcTestBase, test_config_ = GetParam(); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { DetectErrorsInJavaScript(); // Look for errors in our rather complex js. ASSERT_TRUE(temp_working_dir_.CreateUniqueTempDir()); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Set up the command line option with the expected file name. We will check // its existence in HasAllRequiredResources(). webrtc_reference_video_y4m_ = test::GetReferenceFilesDir() diff --git a/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc b/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc index 2212a93..70fa610 100644 --- a/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc @@ -39,7 +39,7 @@ static const char* kTestConfigFlags[] = { class WebRtcWebcamBrowserTest : public WebRtcTestBase, public testing::WithParamInterface<const char*> { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { EXPECT_FALSE(command_line->HasSwitch( switches::kUseFakeDeviceForMediaStream)); EXPECT_FALSE(command_line->HasSwitch( @@ -49,7 +49,7 @@ class WebRtcWebcamBrowserTest : public WebRtcTestBase, } protected: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { DetectErrorsInJavaScript(); // Look for errors in our rather complex js. } diff --git a/chrome/browser/media/desktop_media_list_ash.h b/chrome/browser/media/desktop_media_list_ash.h index 2172256..2386026 100644 --- a/chrome/browser/media/desktop_media_list_ash.h +++ b/chrome/browser/media/desktop_media_list_ash.h @@ -40,13 +40,13 @@ class DesktopMediaListAsh : public DesktopMediaList { virtual ~DesktopMediaListAsh(); // DesktopMediaList interface. - virtual void SetUpdatePeriod(base::TimeDelta period) OVERRIDE; - virtual void SetThumbnailSize(const gfx::Size& thumbnail_size) OVERRIDE; - virtual void StartUpdating(DesktopMediaListObserver* observer) OVERRIDE; - virtual int GetSourceCount() const OVERRIDE; - virtual const Source& GetSource(int index) const OVERRIDE; + virtual void SetUpdatePeriod(base::TimeDelta period) override; + virtual void SetThumbnailSize(const gfx::Size& thumbnail_size) override; + virtual void StartUpdating(DesktopMediaListObserver* observer) override; + virtual int GetSourceCount() const override; + virtual const Source& GetSource(int index) const override; virtual void SetViewDialogWindowId( - content::DesktopMediaID::Id dialog_id) OVERRIDE; + content::DesktopMediaID::Id dialog_id) override; private: // Struct used to represent sources list the model gets from the Worker. diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc index 31935ee..bd6cd7d 100644 --- a/chrome/browser/media/encrypted_media_browsertest.cc +++ b/chrome/browser/media/encrypted_media_browsertest.cc @@ -228,13 +228,13 @@ class EncryptedMediaTestBase : public MediaBrowserTest { scoped_ptr<TestLicenseServer> license_server_; // We want to fail quickly when a test fails because an error is encountered. - virtual void AddWaitForTitles(content::TitleWatcher* title_watcher) OVERRIDE { + virtual void AddWaitForTitles(content::TitleWatcher* title_watcher) override { MediaBrowserTest::AddWaitForTitles(title_watcher); title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeNotSupportedError)); title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError)); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { #if defined(OS_ANDROID) command_line->AppendSwitch( switches::kDisableGestureRequirementForMediaPlayback); @@ -326,7 +326,7 @@ class ECKEncryptedMediaTest : public EncryptedMediaTestBase { } protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { EncryptedMediaTestBase::SetUpCommandLine(command_line); SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line); } @@ -336,7 +336,7 @@ class ECKEncryptedMediaTest : public EncryptedMediaTestBase { // Tests encrypted media playback using Widevine key system. class WVEncryptedMediaTest : public EncryptedMediaTestBase { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { EncryptedMediaTestBase::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnableEncryptedMedia); SetUpCommandLineForKeySystem(kWidevineKeySystem, command_line); @@ -418,7 +418,7 @@ class EncryptedMediaTest } protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { EncryptedMediaTestBase::SetUpCommandLine(command_line); SetUpCommandLineForKeySystem(CurrentKeySystem(), command_line); diff --git a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc index 2a3ba36..e6f115e 100644 --- a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc +++ b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc @@ -325,7 +325,7 @@ class EncryptedMediaIsTypeSupportedExternalClearKeyTest : public EncryptedMediaIsTypeSupportedTest { #if defined(ENABLE_PEPPER_CDMS) protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Platform-specific filename relative to the chrome executable. const char adapter_file_name[] = #if defined(OS_MACOSX) @@ -348,7 +348,7 @@ class EncryptedMediaIsTypeSupportedWidevineTest #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ defined(WIDEVINE_CDM_IS_COMPONENT) protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // File name of the adapter on different platforms. const char adapter_file_name[] = #if defined(OS_MACOSX) @@ -371,7 +371,7 @@ class EncryptedMediaIsTypeSupportedWidevineTest class EncryptedMediaIsTypeSupportedClearKeyCDMRegisteredWithWrongPathTest : public EncryptedMediaIsTypeSupportedTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { RegisterPepperCdm(command_line, "clearkeycdmadapterwrongname.dll", "application/x-ppapi-clearkey-cdm", @@ -383,7 +383,7 @@ class EncryptedMediaIsTypeSupportedClearKeyCDMRegisteredWithWrongPathTest class EncryptedMediaIsTypeSupportedWidevineCDMRegisteredWithWrongPathTest : public EncryptedMediaIsTypeSupportedTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { RegisterPepperCdm(command_line, "widevinecdmadapterwrongname.dll", "application/x-ppapi-widevine-cdm", diff --git a/chrome/browser/media/fake_desktop_media_list.h b/chrome/browser/media/fake_desktop_media_list.h index 65a94e9..32113b8 100644 --- a/chrome/browser/media/fake_desktop_media_list.h +++ b/chrome/browser/media/fake_desktop_media_list.h @@ -21,13 +21,13 @@ class FakeDesktopMediaList : public DesktopMediaList { void SetSourceName(int index, base::string16 name); // DesktopMediaList implementation: - virtual void SetUpdatePeriod(base::TimeDelta period) OVERRIDE; - virtual void SetThumbnailSize(const gfx::Size& thumbnail_size) OVERRIDE; + virtual void SetUpdatePeriod(base::TimeDelta period) override; + virtual void SetThumbnailSize(const gfx::Size& thumbnail_size) override; virtual void SetViewDialogWindowId( - content::DesktopMediaID::Id dialog_id) OVERRIDE; - virtual void StartUpdating(DesktopMediaListObserver* observer) OVERRIDE; - virtual int GetSourceCount() const OVERRIDE; - virtual const Source& GetSource(int index) const OVERRIDE; + content::DesktopMediaID::Id dialog_id) override; + virtual void StartUpdating(DesktopMediaListObserver* observer) override; + virtual int GetSourceCount() const override; + virtual const Source& GetSource(int index) const override; private: std::vector<Source> sources_; diff --git a/chrome/browser/media/media_browsertest.h b/chrome/browser/media/media_browsertest.h index fcb30aa..995f7b1 100644 --- a/chrome/browser/media/media_browsertest.h +++ b/chrome/browser/media/media_browsertest.h @@ -49,7 +49,7 @@ class MediaBrowserTest : public InProcessBrowserTest, // Fails test and sets document title to kPluginCrashed when a plugin crashes. // If IgnorePluginCrash(true) is called then plugin crash is ignored. virtual void PluginCrashed(const base::FilePath& plugin_path, - base::ProcessId plugin_pid) OVERRIDE; + base::ProcessId plugin_pid) override; // When called, the test will ignore any plugin crashes and not fail the test. void IgnorePluginCrash(); diff --git a/chrome/browser/media/media_capture_devices_dispatcher.h b/chrome/browser/media/media_capture_devices_dispatcher.h index a6930ad..ab8f431 100644 --- a/chrome/browser/media/media_capture_devices_dispatcher.h +++ b/chrome/browser/media/media_capture_devices_dispatcher.h @@ -132,17 +132,17 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver, void DisableDeviceEnumerationForTesting(); // Overridden from content::MediaObserver: - virtual void OnAudioCaptureDevicesChanged() OVERRIDE; - virtual void OnVideoCaptureDevicesChanged() OVERRIDE; + virtual void OnAudioCaptureDevicesChanged() override; + virtual void OnVideoCaptureDevicesChanged() override; virtual void OnMediaRequestStateChanged( int render_process_id, int render_frame_id, int page_request_id, const GURL& security_origin, content::MediaStreamType stream_type, - content::MediaRequestState state) OVERRIDE; + content::MediaRequestState state) override; virtual void OnCreatingAudioStream(int render_process_id, - int render_frame_id) OVERRIDE; + int render_frame_id) override; scoped_refptr<MediaStreamCaptureIndicator> GetMediaStreamCaptureIndicator(); @@ -176,7 +176,7 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver, // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Helpers for ProcessMediaAccessRequest(). void ProcessDesktopCaptureAccessRequest( diff --git a/chrome/browser/media/media_stream_capture_indicator.cc b/chrome/browser/media/media_stream_capture_indicator.cc index f6b5806..f7b4ead 100644 --- a/chrome/browser/media/media_stream_capture_indicator.cc +++ b/chrome/browser/media/media_stream_capture_indicator.cc @@ -156,7 +156,7 @@ class MediaStreamCaptureIndicator::WebContentsDeviceUsage private: // content::WebContentsObserver overrides. - virtual void WebContentsDestroyed() OVERRIDE { + virtual void WebContentsDestroyed() override { indicator_->UnregisterWebContents(web_contents()); delete this; } @@ -195,7 +195,7 @@ class MediaStreamCaptureIndicator::UIDelegate private: // content::MediaStreamUI interface. virtual gfx::NativeViewId OnStarted(const base::Closure& close_callback) - OVERRIDE { + override { DCHECK(!started_); started_ = true; if (device_usage_.get()) diff --git a/chrome/browser/media/media_stream_capture_indicator.h b/chrome/browser/media/media_stream_capture_indicator.h index 85dc0eb..cb06962 100644 --- a/chrome/browser/media/media_stream_capture_indicator.h +++ b/chrome/browser/media/media_stream_capture_indicator.h @@ -41,7 +41,7 @@ class MediaStreamCaptureIndicator const content::MediaStreamDevices& devices); // Overrides from StatusIconMenuModel::Delegate implementation. - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; + virtual void ExecuteCommand(int command_id, int event_flags) override; // Returns true if the |web_contents| is capturing user media (e.g., webcam or // microphone input). diff --git a/chrome/browser/media/media_stream_devices_controller.h b/chrome/browser/media/media_stream_devices_controller.h index d3c9dfe..1650c3f 100644 --- a/chrome/browser/media/media_stream_devices_controller.h +++ b/chrome/browser/media/media_stream_devices_controller.h @@ -73,15 +73,15 @@ class MediaStreamDevicesController : public PermissionBubbleRequest { content::MediaStreamRequestResult result); // PermissionBubbleRequest: - virtual int GetIconID() const OVERRIDE; - virtual base::string16 GetMessageText() const OVERRIDE; - virtual base::string16 GetMessageTextFragment() const OVERRIDE; - virtual bool HasUserGesture() const OVERRIDE; - virtual GURL GetRequestingHostname() const OVERRIDE; - virtual void PermissionGranted() OVERRIDE; - virtual void PermissionDenied() OVERRIDE; - virtual void Cancelled() OVERRIDE; - virtual void RequestFinished() OVERRIDE; + virtual int GetIconID() const override; + virtual base::string16 GetMessageText() const override; + virtual base::string16 GetMessageTextFragment() const override; + virtual bool HasUserGesture() const override; + virtual GURL GetRequestingHostname() const override; + virtual void PermissionGranted() override; + virtual void PermissionDenied() override; + virtual void Cancelled() override; + virtual void RequestFinished() override; private: // Returns true if the origin of the request has been granted the media diff --git a/chrome/browser/media/media_stream_infobar_delegate.h b/chrome/browser/media/media_stream_infobar_delegate.h index 21fbb63..8855e47 100644 --- a/chrome/browser/media/media_stream_infobar_delegate.h +++ b/chrome/browser/media/media_stream_infobar_delegate.h @@ -37,16 +37,16 @@ class MediaStreamInfoBarDelegate : public ConfirmInfoBarDelegate { scoped_ptr<MediaStreamDevicesController> controller); // ConfirmInfoBarDelegate: - virtual void InfoBarDismissed() OVERRIDE; - virtual int GetIconID() const OVERRIDE; - virtual Type GetInfoBarType() const OVERRIDE; - virtual MediaStreamInfoBarDelegate* AsMediaStreamInfoBarDelegate() OVERRIDE; - virtual base::string16 GetMessageText() const OVERRIDE; - virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; - virtual bool Accept() OVERRIDE; - virtual bool Cancel() OVERRIDE; - virtual base::string16 GetLinkText() const OVERRIDE; - virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE; + virtual void InfoBarDismissed() override; + virtual int GetIconID() const override; + virtual Type GetInfoBarType() const override; + virtual MediaStreamInfoBarDelegate* AsMediaStreamInfoBarDelegate() override; + virtual base::string16 GetMessageText() const override; + virtual base::string16 GetButtonLabel(InfoBarButton button) const override; + virtual bool Accept() override; + virtual bool Cancel() override; + virtual base::string16 GetLinkText() const override; + virtual bool LinkClicked(WindowOpenDisposition disposition) override; scoped_ptr<MediaStreamDevicesController> controller_; diff --git a/chrome/browser/media/midi_permission_context.h b/chrome/browser/media/midi_permission_context.h index 0beca80..b15db7060 100644 --- a/chrome/browser/media/midi_permission_context.h +++ b/chrome/browser/media/midi_permission_context.h @@ -20,7 +20,7 @@ class MidiPermissionContext : public PermissionContextBase { // PermissionContextBase: virtual void UpdateTabContext(const PermissionRequestID& id, const GURL& requesting_frame, - bool allowed) OVERRIDE; + bool allowed) override; DISALLOW_COPY_AND_ASSIGN(MidiPermissionContext); }; diff --git a/chrome/browser/media/midi_permission_context_factory.h b/chrome/browser/media/midi_permission_context_factory.h index 3cd4469..61305dc 100644 --- a/chrome/browser/media/midi_permission_context_factory.h +++ b/chrome/browser/media/midi_permission_context_factory.h @@ -25,9 +25,9 @@ class MidiPermissionContextFactory // BrowserContextKeyedBaseFactory methods: 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; DISALLOW_COPY_AND_ASSIGN(MidiPermissionContextFactory); }; diff --git a/chrome/browser/media/midi_permission_infobar_delegate.h b/chrome/browser/media/midi_permission_infobar_delegate.h index fb6ef5d..25f670b 100644 --- a/chrome/browser/media/midi_permission_infobar_delegate.h +++ b/chrome/browser/media/midi_permission_infobar_delegate.h @@ -37,8 +37,8 @@ class MidiPermissionInfoBarDelegate : public PermissionInfobarDelegate { virtual ~MidiPermissionInfoBarDelegate(); // ConfirmInfoBarDelegate: - virtual base::string16 GetMessageText() const OVERRIDE; - virtual int GetIconID() const OVERRIDE; + virtual base::string16 GetMessageText() const override; + virtual int GetIconID() const override; GURL requesting_frame_; std::string display_languages_; diff --git a/chrome/browser/media/native_desktop_media_list.cc b/chrome/browser/media/native_desktop_media_list.cc index 6b5eeaa..b2f036e 100644 --- a/chrome/browser/media/native_desktop_media_list.cc +++ b/chrome/browser/media/native_desktop_media_list.cc @@ -97,8 +97,8 @@ class NativeDesktopMediaList::Worker typedef std::map<DesktopMediaID, uint32> ImageHashesMap; // webrtc::DesktopCapturer::Callback interface. - virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE; - virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) OVERRIDE; + virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) override; + virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) override; base::WeakPtr<NativeDesktopMediaList> media_list_; diff --git a/chrome/browser/media/native_desktop_media_list.h b/chrome/browser/media/native_desktop_media_list.h index 8d7a1cb..f64560c 100644 --- a/chrome/browser/media/native_desktop_media_list.h +++ b/chrome/browser/media/native_desktop_media_list.h @@ -31,13 +31,13 @@ class NativeDesktopMediaList : public DesktopMediaList { virtual ~NativeDesktopMediaList(); // DesktopMediaList interface. - virtual void SetUpdatePeriod(base::TimeDelta period) OVERRIDE; - virtual void SetThumbnailSize(const gfx::Size& thumbnail_size) OVERRIDE; - virtual void StartUpdating(DesktopMediaListObserver* observer) OVERRIDE; - virtual int GetSourceCount() const OVERRIDE; - virtual const Source& GetSource(int index) const OVERRIDE; + virtual void SetUpdatePeriod(base::TimeDelta period) override; + virtual void SetThumbnailSize(const gfx::Size& thumbnail_size) override; + virtual void StartUpdating(DesktopMediaListObserver* observer) override; + virtual int GetSourceCount() const override; + virtual const Source& GetSource(int index) const override; virtual void SetViewDialogWindowId( - content::DesktopMediaID::Id dialog_id) OVERRIDE; + content::DesktopMediaID::Id dialog_id) override; private: class Worker; diff --git a/chrome/browser/media/native_desktop_media_list_unittest.cc b/chrome/browser/media/native_desktop_media_list_unittest.cc index 085c454..460a851 100644 --- a/chrome/browser/media/native_desktop_media_list_unittest.cc +++ b/chrome/browser/media/native_desktop_media_list_unittest.cc @@ -35,11 +35,11 @@ class FakeScreenCapturer : public webrtc::ScreenCapturer { virtual ~FakeScreenCapturer() {} // webrtc::ScreenCapturer implementation. - virtual void Start(Callback* callback) OVERRIDE { + virtual void Start(Callback* callback) override { callback_ = callback; } - virtual void Capture(const webrtc::DesktopRegion& region) OVERRIDE { + virtual void Capture(const webrtc::DesktopRegion& region) override { DCHECK(callback_); webrtc::DesktopFrame* frame = new webrtc::BasicDesktopFrame(webrtc::DesktopSize(10, 10)); @@ -48,18 +48,18 @@ class FakeScreenCapturer : public webrtc::ScreenCapturer { } virtual void SetMouseShapeObserver( - MouseShapeObserver* mouse_shape_observer) OVERRIDE { + MouseShapeObserver* mouse_shape_observer) override { NOTIMPLEMENTED(); } - virtual bool GetScreenList(ScreenList* screens) OVERRIDE { + virtual bool GetScreenList(ScreenList* screens) override { webrtc::ScreenCapturer::Screen screen; screen.id = 0; screens->push_back(screen); return true; } - virtual bool SelectScreen(webrtc::ScreenId id) OVERRIDE { + virtual bool SelectScreen(webrtc::ScreenId id) override { EXPECT_EQ(0, id); return true; } @@ -90,11 +90,11 @@ class FakeWindowCapturer : public webrtc::WindowCapturer { } // webrtc::WindowCapturer implementation. - virtual void Start(Callback* callback) OVERRIDE { + virtual void Start(Callback* callback) override { callback_ = callback; } - virtual void Capture(const webrtc::DesktopRegion& region) OVERRIDE { + virtual void Capture(const webrtc::DesktopRegion& region) override { DCHECK(callback_); base::AutoLock lock(frame_values_lock_); @@ -108,18 +108,18 @@ class FakeWindowCapturer : public webrtc::WindowCapturer { callback_->OnCaptureCompleted(frame); } - virtual bool GetWindowList(WindowList* windows) OVERRIDE { + virtual bool GetWindowList(WindowList* windows) override { base::AutoLock lock(window_list_lock_); *windows = window_list_; return true; } - virtual bool SelectWindow(WindowId id) OVERRIDE { + virtual bool SelectWindow(WindowId id) override { selected_window_id_ = id; return true; } - virtual bool BringSelectedWindowToFront() OVERRIDE { + virtual bool BringSelectedWindowToFront() override { return true; } diff --git a/chrome/browser/media/protected_media_identifier_infobar_delegate.h b/chrome/browser/media/protected_media_identifier_infobar_delegate.h index ba22ded..7c05e58 100644 --- a/chrome/browser/media/protected_media_identifier_infobar_delegate.h +++ b/chrome/browser/media/protected_media_identifier_infobar_delegate.h @@ -41,17 +41,17 @@ class ProtectedMediaIdentifierInfoBarDelegate : public ConfirmInfoBarDelegate { private: // ConfirmInfoBarDelegate: - virtual void InfoBarDismissed() OVERRIDE; - virtual int GetIconID() const OVERRIDE; - virtual Type GetInfoBarType() const OVERRIDE; + virtual void InfoBarDismissed() override; + virtual int GetIconID() const override; + virtual Type GetInfoBarType() const override; virtual bool ShouldExpireInternal( - const NavigationDetails& details) const OVERRIDE; - virtual base::string16 GetMessageText() const OVERRIDE; - virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; - virtual bool Accept() OVERRIDE; - virtual bool Cancel() OVERRIDE; - virtual base::string16 GetLinkText() const OVERRIDE; - virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE; + const NavigationDetails& details) const override; + virtual base::string16 GetMessageText() const override; + virtual base::string16 GetButtonLabel(InfoBarButton button) const override; + virtual bool Accept() override; + virtual bool Cancel() override; + virtual base::string16 GetLinkText() const override; + virtual bool LinkClicked(WindowOpenDisposition disposition) override; PermissionQueueController* controller_; const PermissionRequestID id_; diff --git a/chrome/browser/media/protected_media_identifier_permission_context_factory.cc b/chrome/browser/media/protected_media_identifier_permission_context_factory.cc index 11c2072..76f20e7 100644 --- a/chrome/browser/media/protected_media_identifier_permission_context_factory.cc +++ b/chrome/browser/media/protected_media_identifier_permission_context_factory.cc @@ -23,7 +23,7 @@ class Service : public KeyedService { return context_.get(); } - virtual void Shutdown() OVERRIDE { + virtual void Shutdown() override { context()->ShutdownOnUIThread(); } diff --git a/chrome/browser/media/protected_media_identifier_permission_context_factory.h b/chrome/browser/media/protected_media_identifier_permission_context_factory.h index 1e5fcb4..edc733e 100644 --- a/chrome/browser/media/protected_media_identifier_permission_context_factory.h +++ b/chrome/browser/media/protected_media_identifier_permission_context_factory.h @@ -28,11 +28,11 @@ class ProtectedMediaIdentifierPermissionContextFactory // BrowserContextKeyedBaseFactory methods: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; virtual void RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) OVERRIDE; + user_prefs::PrefRegistrySyncable* registry) override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; DISALLOW_COPY_AND_ASSIGN( ProtectedMediaIdentifierPermissionContextFactory); diff --git a/chrome/browser/media/webrtc_log_uploader.h b/chrome/browser/media/webrtc_log_uploader.h index 86c2d3a..ae65c27 100644 --- a/chrome/browser/media/webrtc_log_uploader.h +++ b/chrome/browser/media/webrtc_log_uploader.h @@ -51,9 +51,9 @@ class WebRtcLogUploader : public net::URLFetcherDelegate { virtual ~WebRtcLogUploader(); // net::URLFetcherDelegate implementation. - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; virtual void OnURLFetchUploadProgress(const net::URLFetcher* source, - int64 current, int64 total) OVERRIDE; + int64 current, int64 total) override; // Returns true is number of logs limit is not reached yet. Increases log // count if true is returned. Must be called before UploadLog(). diff --git a/chrome/browser/media/webrtc_logging_handler_host.h b/chrome/browser/media/webrtc_logging_handler_host.h index dfff8c3..9b8398d 100644 --- a/chrome/browser/media/webrtc_logging_handler_host.h +++ b/chrome/browser/media/webrtc_logging_handler_host.h @@ -123,9 +123,9 @@ class WebRtcLoggingHandlerHost : public content::BrowserMessageFilter { virtual ~WebRtcLoggingHandlerHost(); // BrowserMessageFilter implementation. - virtual void OnChannelClosing() OVERRIDE; - virtual void OnDestruct() const OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnChannelClosing() override; + virtual void OnDestruct() const override; + virtual bool OnMessageReceived(const IPC::Message& message) override; // Handles log message requests from renderer process. void OnAddLogMessages(const std::vector<WebRtcLoggingMessageData>& messages); diff --git a/chrome/browser/media/webrtc_rtp_dump_handler_unittest.cc b/chrome/browser/media/webrtc_rtp_dump_handler_unittest.cc index 3066993..78ad5be 100644 --- a/chrome/browser/media/webrtc_rtp_dump_handler_unittest.cc +++ b/chrome/browser/media/webrtc_rtp_dump_handler_unittest.cc @@ -31,14 +31,14 @@ class FakeDumpWriter : public WebRtcRtpDumpWriter { virtual void WriteRtpPacket(const uint8* packet_header, size_t header_length, size_t packet_length, - bool incoming) OVERRIDE { + bool incoming) override { current_dump_size_ += header_length; if (current_dump_size_ > max_dump_size_) max_size_reached_callback_.Run(); } virtual void EndDump(RtpDumpType type, - const EndDumpCallback& finished_callback) OVERRIDE { + const EndDumpCallback& finished_callback) override { bool incoming_sucess = end_dump_success_; bool outgoing_success = end_dump_success_; diff --git a/chrome/browser/media/wv_test_license_server_config.h b/chrome/browser/media/wv_test_license_server_config.h index 4acfd69..60e12c8 100644 --- a/chrome/browser/media/wv_test_license_server_config.h +++ b/chrome/browser/media/wv_test_license_server_config.h @@ -13,11 +13,11 @@ class WVTestLicenseServerConfig : public TestLicenseServerConfig { WVTestLicenseServerConfig(); virtual ~WVTestLicenseServerConfig(); - virtual std::string GetServerURL() OVERRIDE; + virtual std::string GetServerURL() override; - virtual bool GetServerCommandLine(base::CommandLine* command_line) OVERRIDE; + virtual bool GetServerCommandLine(base::CommandLine* command_line) override; - virtual bool IsPlatformSupported() OVERRIDE; + virtual bool IsPlatformSupported() override; private: // Server port. The port value should be set by calling SelectServerPort(). diff --git a/chrome/browser/media_galleries/fileapi/av_scanning_file_validator.h b/chrome/browser/media_galleries/fileapi/av_scanning_file_validator.h index f3ab5de..6144550 100644 --- a/chrome/browser/media_galleries/fileapi/av_scanning_file_validator.h +++ b/chrome/browser/media_galleries/fileapi/av_scanning_file_validator.h @@ -21,7 +21,7 @@ class AVScanningFileValidator : public storage::CopyOrMoveFileValidator { // Subclasses will not typically override this method. virtual void StartPostWriteValidation( const base::FilePath& dest_platform_path, - const ResultCallback& result_callback) OVERRIDE; + const ResultCallback& result_callback) override; protected: AVScanningFileValidator(); diff --git a/chrome/browser/media_galleries/fileapi/device_media_async_file_util.h b/chrome/browser/media_galleries/fileapi/device_media_async_file_util.h index 71ce67b..270b056 100644 --- a/chrome/browser/media_galleries/fileapi/device_media_async_file_util.h +++ b/chrome/browser/media_galleries/fileapi/device_media_async_file_util.h @@ -43,68 +43,68 @@ class DeviceMediaAsyncFileUtil : public storage::AsyncFileUtil { scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, int file_flags, - const CreateOrOpenCallback& callback) OVERRIDE; + const CreateOrOpenCallback& callback) override; virtual void EnsureFileExists( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const EnsureFileExistsCallback& callback) OVERRIDE; + const EnsureFileExistsCallback& callback) override; virtual void CreateDirectory( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, bool exclusive, bool recursive, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void GetFileInfo( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const GetFileInfoCallback& callback) OVERRIDE; + const GetFileInfoCallback& callback) override; virtual void ReadDirectory( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const ReadDirectoryCallback& callback) OVERRIDE; + const ReadDirectoryCallback& callback) override; virtual void Touch(scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, const base::Time& last_access_time, const base::Time& last_modified_time, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void Truncate(scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, int64 length, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void CopyFileLocal( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& src_url, const storage::FileSystemURL& dest_url, CopyOrMoveOption option, const CopyFileProgressCallback& progress_callback, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void MoveFileLocal( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& src_url, const storage::FileSystemURL& dest_url, CopyOrMoveOption option, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void CopyInForeignFile( scoped_ptr<storage::FileSystemOperationContext> context, const base::FilePath& src_file_path, const storage::FileSystemURL& dest_url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void DeleteFile( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void DeleteDirectory( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void DeleteRecursively( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void CreateSnapshotFile( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const CreateSnapshotFileCallback& callback) OVERRIDE; + const CreateSnapshotFileCallback& callback) override; // This method is called when existing Blobs are read. // |expected_modification_time| indicates the expected snapshot state of the diff --git a/chrome/browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc b/chrome/browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc index e63c5b4..ad8e13a 100644 --- a/chrome/browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc +++ b/chrome/browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc @@ -40,7 +40,7 @@ class ITunesFinderWinTest : public InProcessBrowserTest { virtual ~ITunesFinderWinTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(app_data_dir_.CreateUniqueTempDir()); ASSERT_TRUE(music_dir_.CreateUniqueTempDir()); app_data_dir_override_.reset( diff --git a/chrome/browser/media_galleries/fileapi/iphoto_data_provider.h b/chrome/browser/media_galleries/fileapi/iphoto_data_provider.h index d54ddfd..3c78704 100644 --- a/chrome/browser/media_galleries/fileapi/iphoto_data_provider.h +++ b/chrome/browser/media_galleries/fileapi/iphoto_data_provider.h @@ -32,7 +32,7 @@ class IPhotoDataProvider : public iapps::IAppsDataProvider { // Parse the library xml file. virtual void DoParseLibrary(const base::FilePath& library_path, - const ReadyCallback& ready_callback) OVERRIDE; + const ReadyCallback& ready_callback) override; virtual std::vector<std::string> GetAlbumNames() const; virtual std::map<std::string, base::FilePath> GetAlbumContents( diff --git a/chrome/browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc b/chrome/browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc index 3b6e31a..e85143b 100644 --- a/chrome/browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc +++ b/chrome/browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc @@ -38,7 +38,7 @@ class TestIPhotoDataProvider : public IPhotoDataProvider { private: virtual void OnLibraryChanged(const base::FilePath& path, - bool error) OVERRIDE { + bool error) override { IPhotoDataProvider::OnLibraryChanged(path, error); callback_.Run(); } @@ -54,7 +54,7 @@ class IPhotoDataProviderTest : public InProcessBrowserTest { virtual ~IPhotoDataProviderTest() {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(library_dir_.CreateUniqueTempDir()); WriteLibraryInternal(); // The ImportedMediaGalleryRegistry is created on which ever thread calls @@ -158,7 +158,7 @@ class IPhotoDataProviderBasicTest : public IPhotoDataProviderTest { IPhotoDataProviderBasicTest() {} virtual ~IPhotoDataProviderBasicTest() {} - virtual std::string GetLibraryString() OVERRIDE { + virtual std::string GetLibraryString() override { return "<plist><dict>\n" "<key>List of Albums</key>\n" "<array>" @@ -268,7 +268,7 @@ class IPhotoDataProviderBasicTest : public IPhotoDataProviderTest { "</dict></plist>\n"; } - virtual void StartTest(bool parse_success) OVERRIDE { + virtual void StartTest(bool parse_success) override { EXPECT_TRUE(parse_success); std::vector<std::string> names = data_provider()->GetAlbumNames(); @@ -346,7 +346,7 @@ class IPhotoDataProviderRefreshTest : public IPhotoDataProviderTest { std::string another_album; - virtual std::string GetLibraryString() OVERRIDE { + virtual std::string GetLibraryString() override { return "<plist><dict>\n" "<key>List of Albums</key>\n" "<array>" @@ -381,7 +381,7 @@ class IPhotoDataProviderRefreshTest : public IPhotoDataProviderTest { "</dict></plist>\n"; } - virtual void StartTest(bool parse_success) OVERRIDE { + virtual void StartTest(bool parse_success) override { EXPECT_TRUE(parse_success); EXPECT_EQ(FilePath("/vol/path1.jpg"), @@ -443,7 +443,7 @@ class IPhotoDataProviderInvalidTest : public IPhotoDataProviderTest { IPhotoDataProviderInvalidTest() {} virtual ~IPhotoDataProviderInvalidTest() {} - virtual void StartTest(bool parse_success) OVERRIDE { + virtual void StartTest(bool parse_success) override { EXPECT_TRUE(parse_success); SetLibraryChangeCallback( diff --git a/chrome/browser/media_galleries/fileapi/iphoto_file_util.h b/chrome/browser/media_galleries/fileapi/iphoto_file_util.h index ad5a8c3..d936281 100644 --- a/chrome/browser/media_galleries/fileapi/iphoto_file_util.h +++ b/chrome/browser/media_galleries/fileapi/iphoto_file_util.h @@ -39,34 +39,34 @@ class IPhotoFileUtil : public NativeMediaFileUtil { virtual void GetFileInfoOnTaskRunnerThread( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const GetFileInfoCallback& callback) OVERRIDE; + const GetFileInfoCallback& callback) override; virtual void ReadDirectoryOnTaskRunnerThread( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const ReadDirectoryCallback& callback) OVERRIDE; + const ReadDirectoryCallback& callback) override; virtual void CreateSnapshotFileOnTaskRunnerThread( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const CreateSnapshotFileCallback& callback) OVERRIDE; + const CreateSnapshotFileCallback& callback) override; virtual base::File::Error GetFileInfoSync( storage::FileSystemOperationContext* context, const storage::FileSystemURL& url, base::File::Info* file_info, - base::FilePath* platform_path) OVERRIDE; + base::FilePath* platform_path) override; virtual base::File::Error ReadDirectorySync( storage::FileSystemOperationContext* context, const storage::FileSystemURL& url, - EntryList* file_list) OVERRIDE; + EntryList* file_list) override; virtual base::File::Error DeleteDirectorySync( storage::FileSystemOperationContext* context, - const storage::FileSystemURL& url) OVERRIDE; + const storage::FileSystemURL& url) override; virtual base::File::Error DeleteFileSync( storage::FileSystemOperationContext* context, - const storage::FileSystemURL& url) OVERRIDE; + const storage::FileSystemURL& url) override; virtual base::File::Error GetLocalFilePath( storage::FileSystemOperationContext* context, const storage::FileSystemURL& url, - base::FilePath* local_file_path) OVERRIDE; + base::FilePath* local_file_path) override; private: void GetFileInfoWithFreshDataProvider( diff --git a/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc index 7a2f9a8..8d1fe9d 100644 --- a/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc @@ -75,11 +75,11 @@ class TestIPhotoDataProvider : public IPhotoDataProvider { virtual ~TestIPhotoDataProvider() {} - virtual void RefreshData(const ReadyCallback& ready_callback) OVERRIDE { + virtual void RefreshData(const ReadyCallback& ready_callback) override { ready_callback.Run(true /* success */); } - virtual std::vector<std::string> GetAlbumNames() const OVERRIDE { + virtual std::vector<std::string> GetAlbumNames() const override { std::vector<std::string> names; names.push_back("Album1"); names.push_back("has_originals"); @@ -87,7 +87,7 @@ class TestIPhotoDataProvider : public IPhotoDataProvider { } virtual std::map<std::string, base::FilePath> GetAlbumContents( - const std::string& album) const OVERRIDE { + const std::string& album) const override { std::map<std::string, base::FilePath> contents; contents["a.jpg"] = library_path().AppendASCII("a.jpg"); return contents; @@ -95,16 +95,16 @@ class TestIPhotoDataProvider : public IPhotoDataProvider { virtual base::FilePath GetPhotoLocationInAlbum( const std::string& album, - const std::string& filename) const OVERRIDE { + const std::string& filename) const override { return library_path().AppendASCII("a.jpg"); } - virtual bool HasOriginals(const std::string& album) const OVERRIDE { + virtual bool HasOriginals(const std::string& album) const override { return (album == "has_originals"); } virtual std::map<std::string, base::FilePath> GetOriginals( - const std::string& album) const OVERRIDE { + const std::string& album) const override { std::map<std::string, base::FilePath> contents; contents["a.jpg"] = library_path().AppendASCII("orig.jpg"); return contents; @@ -112,7 +112,7 @@ class TestIPhotoDataProvider : public IPhotoDataProvider { virtual base::FilePath GetOriginalPhotoLocation( const std::string& album, - const std::string& filename) const OVERRIDE { + const std::string& filename) const override { return library_path().AppendASCII("orig.jpg"); } @@ -130,7 +130,7 @@ class TestIPhotoFileUtil : public IPhotoFileUtil { virtual ~TestIPhotoFileUtil() {} private: - virtual IPhotoDataProvider* GetDataProvider() OVERRIDE { + virtual IPhotoDataProvider* GetDataProvider() override { return data_provider_; } @@ -147,7 +147,7 @@ class TestMediaFileSystemBackend : public MediaFileSystemBackend { test_file_util_(iphoto_file_util) {} virtual storage::AsyncFileUtil* GetAsyncFileUtil( - storage::FileSystemType type) OVERRIDE { + storage::FileSystemType type) override { if (type != storage::kFileSystemTypeIphoto) return NULL; @@ -184,7 +184,7 @@ class IPhotoFileUtilTest : public testing::Test { new TestIPhotoDataProvider(fake_library_dir_.path())); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(profile_dir_.CreateUniqueTempDir()); ImportedMediaGalleryRegistry::GetInstance()->Initialize(); diff --git a/chrome/browser/media_galleries/fileapi/itunes_data_provider.h b/chrome/browser/media_galleries/fileapi/itunes_data_provider.h index cb4316c..893d9a6 100644 --- a/chrome/browser/media_galleries/fileapi/itunes_data_provider.h +++ b/chrome/browser/media_galleries/fileapi/itunes_data_provider.h @@ -66,7 +66,7 @@ class ITunesDataProvider : public iapps::IAppsDataProvider { // Parse the library xml file. virtual void DoParseLibrary(const base::FilePath& library_path, - const ReadyCallback& ready_callback) OVERRIDE; + const ReadyCallback& ready_callback) override; // Called when the utility process finishes parsing the library XML file. void OnLibraryParsed(const ReadyCallback& ready_callback, diff --git a/chrome/browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc b/chrome/browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc index 114c9e0..d71ff0c 100644 --- a/chrome/browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc +++ b/chrome/browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc @@ -58,7 +58,7 @@ class TestITunesDataProvider : public ITunesDataProvider { private: virtual void OnLibraryChanged(const base::FilePath& path, - bool error) OVERRIDE { + bool error) override { ITunesDataProvider::OnLibraryChanged(path, error); callback_.Run(); } @@ -74,7 +74,7 @@ class ITunesDataProviderTest : public InProcessBrowserTest { virtual ~ITunesDataProviderTest() {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(library_dir_.CreateUniqueTempDir()); WriteLibraryInternal(SetUpLibrary()); // The ImportedMediaGalleryRegistry is created on which ever thread calls @@ -217,14 +217,14 @@ class ITunesDataProviderBasicTest : public ITunesDataProviderTest { ITunesDataProviderBasicTest() {} virtual ~ITunesDataProviderBasicTest() {} - virtual std::vector<LibraryEntry> SetUpLibrary() OVERRIDE { + virtual std::vector<LibraryEntry> SetUpLibrary() override { base::FilePath track = library_dir().AppendASCII("Track.mp3"); std::vector<LibraryEntry> entries; entries.push_back(LibraryEntry("Artist", "Album", track)); return entries; } - virtual void StartTest(bool parse_success) OVERRIDE { + virtual void StartTest(bool parse_success) override { EXPECT_TRUE(parse_success); // KnownArtist @@ -285,14 +285,14 @@ class ITunesDataProviderRefreshTest : public ITunesDataProviderTest { ITunesDataProviderRefreshTest() {} virtual ~ITunesDataProviderRefreshTest() {} - virtual std::vector<LibraryEntry> SetUpLibrary() OVERRIDE { + virtual std::vector<LibraryEntry> SetUpLibrary() override { base::FilePath track = library_dir().AppendASCII("Track.mp3"); std::vector<LibraryEntry> entries; entries.push_back(LibraryEntry("Artist", "Album", track)); return entries; } - virtual void StartTest(bool parse_success) OVERRIDE { + virtual void StartTest(bool parse_success) override { EXPECT_TRUE(parse_success); // Initial contents. @@ -335,14 +335,14 @@ class ITunesDataProviderInvalidTest : public ITunesDataProviderTest { ITunesDataProviderInvalidTest() {} virtual ~ITunesDataProviderInvalidTest() {} - virtual std::vector<LibraryEntry> SetUpLibrary() OVERRIDE { + virtual std::vector<LibraryEntry> SetUpLibrary() override { base::FilePath track = library_dir().AppendASCII("Track.mp3"); std::vector<LibraryEntry> entries; entries.push_back(LibraryEntry("Artist", "Album", track)); return entries; } - virtual void StartTest(bool parse_success) OVERRIDE { + virtual void StartTest(bool parse_success) override { EXPECT_TRUE(parse_success); SetLibraryChangeCallback( @@ -367,7 +367,7 @@ class ITunesDataProviderUniqueNameTest : public ITunesDataProviderTest { ITunesDataProviderUniqueNameTest() {} virtual ~ITunesDataProviderUniqueNameTest() {} - virtual std::vector<LibraryEntry> SetUpLibrary() OVERRIDE { + virtual std::vector<LibraryEntry> SetUpLibrary() override { base::FilePath track = library_dir().AppendASCII("Track.mp3"); std::vector<LibraryEntry> entries; // Dupe album names should get uniquified with the track id, which in the @@ -378,7 +378,7 @@ class ITunesDataProviderUniqueNameTest : public ITunesDataProviderTest { return entries; } - virtual void StartTest(bool parse_success) OVERRIDE { + virtual void StartTest(bool parse_success) override { EXPECT_TRUE(parse_success); base::FilePath track = @@ -411,7 +411,7 @@ class ITunesDataProviderEscapeTest : public ITunesDataProviderTest { ITunesDataProviderEscapeTest() {} virtual ~ITunesDataProviderEscapeTest() {} - virtual std::vector<LibraryEntry> SetUpLibrary() OVERRIDE { + virtual std::vector<LibraryEntry> SetUpLibrary() override { base::FilePath track = library_dir().AppendASCII("Track:1.mp3"); std::vector<LibraryEntry> entries; entries.push_back(LibraryEntry("Artist:/name", "Album:name/", track)); @@ -421,7 +421,7 @@ class ITunesDataProviderEscapeTest : public ITunesDataProviderTest { return entries; } - virtual void StartTest(bool parse_success) OVERRIDE { + virtual void StartTest(bool parse_success) override { EXPECT_TRUE(parse_success); base::FilePath track = diff --git a/chrome/browser/media_galleries/fileapi/itunes_file_util.h b/chrome/browser/media_galleries/fileapi/itunes_file_util.h index 8c9db75..8905977 100644 --- a/chrome/browser/media_galleries/fileapi/itunes_file_util.h +++ b/chrome/browser/media_galleries/fileapi/itunes_file_util.h @@ -30,40 +30,40 @@ class ITunesFileUtil : public NativeMediaFileUtil { virtual void GetFileInfoOnTaskRunnerThread( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const GetFileInfoCallback& callback) OVERRIDE; + const GetFileInfoCallback& callback) override; virtual void ReadDirectoryOnTaskRunnerThread( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const ReadDirectoryCallback& callback) OVERRIDE; + const ReadDirectoryCallback& callback) override; virtual void CreateSnapshotFileOnTaskRunnerThread( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const CreateSnapshotFileCallback& callback) OVERRIDE; + const CreateSnapshotFileCallback& callback) override; virtual base::File::Error GetFileInfoSync( storage::FileSystemOperationContext* context, const storage::FileSystemURL& url, base::File::Info* file_info, - base::FilePath* platform_path) OVERRIDE; + base::FilePath* platform_path) override; virtual base::File::Error ReadDirectorySync( storage::FileSystemOperationContext* context, const storage::FileSystemURL& url, - EntryList* file_list) OVERRIDE; + EntryList* file_list) override; virtual base::File::Error DeleteDirectorySync( storage::FileSystemOperationContext* context, - const storage::FileSystemURL& url) OVERRIDE; + const storage::FileSystemURL& url) override; virtual base::File::Error DeleteFileSync( storage::FileSystemOperationContext* context, - const storage::FileSystemURL& url) OVERRIDE; + const storage::FileSystemURL& url) override; virtual base::File::Error CreateSnapshotFileSync( storage::FileSystemOperationContext* context, const storage::FileSystemURL& url, base::File::Info* file_info, base::FilePath* platform_path, - scoped_refptr<storage::ShareableFileReference>* file_ref) OVERRIDE; + scoped_refptr<storage::ShareableFileReference>* file_ref) override; virtual base::File::Error GetLocalFilePath( storage::FileSystemOperationContext* context, const storage::FileSystemURL& url, - base::FilePath* local_file_path) OVERRIDE; + base::FilePath* local_file_path) override; private: void GetFileInfoWithFreshDataProvider( diff --git a/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc index 95eb465..d6bb474 100644 --- a/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc @@ -73,11 +73,11 @@ class TestITunesDataProvider : public ITunesDataProvider { virtual ~TestITunesDataProvider() {} - virtual void RefreshData(const ReadyCallback& ready_callback) OVERRIDE { + virtual void RefreshData(const ReadyCallback& ready_callback) override { ready_callback.Run(true /* success */); } - virtual const base::FilePath& auto_add_path() const OVERRIDE { + virtual const base::FilePath& auto_add_path() const override { return fake_auto_add_dir_.path(); } @@ -104,7 +104,7 @@ class TestITunesFileUtil : public ITunesFileUtil { virtual ~TestITunesFileUtil() {} private: - virtual ITunesDataProvider* GetDataProvider() OVERRIDE { + virtual ITunesDataProvider* GetDataProvider() override { return data_provider_; } @@ -121,7 +121,7 @@ class TestMediaFileSystemBackend : public MediaFileSystemBackend { test_file_util_(itunes_file_util) {} virtual storage::AsyncFileUtil* GetAsyncFileUtil( - storage::FileSystemType type) OVERRIDE { + storage::FileSystemType type) override { if (type != storage::kFileSystemTypeItunes) return NULL; @@ -152,7 +152,7 @@ class ItunesFileUtilTest : public testing::Test { new TestITunesDataProvider(fake_library_dir_.path())); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(profile_dir_.CreateUniqueTempDir()); ImportedMediaGalleryRegistry::GetInstance()->Initialize(); diff --git a/chrome/browser/media_galleries/fileapi/media_file_system_backend.h b/chrome/browser/media_galleries/fileapi/media_file_system_backend.h index 5827626..aa164d0 100644 --- a/chrome/browser/media_galleries/fileapi/media_file_system_backend.h +++ b/chrome/browser/media_galleries/fileapi/media_file_system_backend.h @@ -55,43 +55,43 @@ class MediaFileSystemBackend : public storage::FileSystemBackend { const base::Callback<void(base::File::Error result)>& callback); // FileSystemBackend implementation. - virtual bool CanHandleType(storage::FileSystemType type) const OVERRIDE; - virtual void Initialize(storage::FileSystemContext* context) OVERRIDE; + virtual bool CanHandleType(storage::FileSystemType type) const override; + virtual void Initialize(storage::FileSystemContext* context) override; virtual void ResolveURL(const storage::FileSystemURL& url, storage::OpenFileSystemMode mode, - const OpenFileSystemCallback& callback) OVERRIDE; + const OpenFileSystemCallback& callback) override; virtual storage::AsyncFileUtil* GetAsyncFileUtil( - storage::FileSystemType type) OVERRIDE; + storage::FileSystemType type) override; virtual storage::WatcherManager* GetWatcherManager( - storage::FileSystemType type) OVERRIDE; + storage::FileSystemType type) override; virtual storage::CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(storage::FileSystemType type, - base::File::Error* error_code) OVERRIDE; + base::File::Error* error_code) override; virtual storage::FileSystemOperation* CreateFileSystemOperation( const storage::FileSystemURL& url, storage::FileSystemContext* context, - base::File::Error* error_code) const OVERRIDE; + base::File::Error* error_code) const override; virtual bool SupportsStreaming( - const storage::FileSystemURL& url) const OVERRIDE; + const storage::FileSystemURL& url) const override; virtual bool HasInplaceCopyImplementation( - storage::FileSystemType type) const OVERRIDE; + storage::FileSystemType type) const override; virtual scoped_ptr<storage::FileStreamReader> CreateFileStreamReader( const storage::FileSystemURL& url, int64 offset, int64 max_bytes_to_read, const base::Time& expected_modification_time, - storage::FileSystemContext* context) const OVERRIDE; + storage::FileSystemContext* context) const override; virtual scoped_ptr<storage::FileStreamWriter> CreateFileStreamWriter( const storage::FileSystemURL& url, int64 offset, - storage::FileSystemContext* context) const OVERRIDE; - virtual storage::FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE; + storage::FileSystemContext* context) const override; + virtual storage::FileSystemQuotaUtil* GetQuotaUtil() override; virtual const storage::UpdateObserverList* GetUpdateObservers( - storage::FileSystemType type) const OVERRIDE; + storage::FileSystemType type) const override; virtual const storage::ChangeObserverList* GetChangeObservers( - storage::FileSystemType type) const OVERRIDE; + storage::FileSystemType type) const override; virtual const storage::AccessObserverList* GetAccessObservers( - storage::FileSystemType type) const OVERRIDE; + storage::FileSystemType type) const override; private: // Store the profile path. We need this to create temporary snapshot files. diff --git a/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc b/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc index 266a40b..5965eb7 100644 --- a/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc +++ b/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc @@ -17,14 +17,14 @@ class InvalidFileValidator : public storage::CopyOrMoveFileValidator { virtual ~InvalidFileValidator() {} virtual void StartPreWriteValidation( const storage::CopyOrMoveFileValidator::ResultCallback& result_callback) - OVERRIDE { + override { result_callback.Run(base::File::FILE_ERROR_SECURITY); } virtual void StartPostWriteValidation( const base::FilePath& dest_platform_path, const storage::CopyOrMoveFileValidator::ResultCallback& result_callback) - OVERRIDE { + override { result_callback.Run(base::File::FILE_ERROR_SECURITY); } diff --git a/chrome/browser/media_galleries/fileapi/media_file_validator_factory.h b/chrome/browser/media_galleries/fileapi/media_file_validator_factory.h index 8b08c87..b351d92 100644 --- a/chrome/browser/media_galleries/fileapi/media_file_validator_factory.h +++ b/chrome/browser/media_galleries/fileapi/media_file_validator_factory.h @@ -28,7 +28,7 @@ class MediaFileValidatorFactory // CopyOrMoveFileValidatorFactory implementation. virtual storage::CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator( const storage::FileSystemURL& src, - const base::FilePath& platform_path) OVERRIDE; + const base::FilePath& platform_path) override; private: DISALLOW_COPY_AND_ASSIGN(MediaFileValidatorFactory); diff --git a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h index 584b323..7fcfcacf 100644 --- a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h +++ b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h @@ -34,9 +34,9 @@ class MTPFileStreamReader // FileStreamReader overrides. virtual int Read(net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int64 GetLength( - const net::Int64CompletionCallback& callback) OVERRIDE; + const net::Int64CompletionCallback& callback) override; private: void FinishValidateMediaHeader( diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util.h b/chrome/browser/media_galleries/fileapi/native_media_file_util.h index 8f5b570..4575439 100644 --- a/chrome/browser/media_galleries/fileapi/native_media_file_util.h +++ b/chrome/browser/media_galleries/fileapi/native_media_file_util.h @@ -46,68 +46,68 @@ class NativeMediaFileUtil : public storage::AsyncFileUtil { scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, int file_flags, - const CreateOrOpenCallback& callback) OVERRIDE; + const CreateOrOpenCallback& callback) override; virtual void EnsureFileExists( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const EnsureFileExistsCallback& callback) OVERRIDE; + const EnsureFileExistsCallback& callback) override; virtual void CreateDirectory( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, bool exclusive, bool recursive, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void GetFileInfo( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const GetFileInfoCallback& callback) OVERRIDE; + const GetFileInfoCallback& callback) override; virtual void ReadDirectory( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const ReadDirectoryCallback& callback) OVERRIDE; + const ReadDirectoryCallback& callback) override; virtual void Touch(scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, const base::Time& last_access_time, const base::Time& last_modified_time, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void Truncate(scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, int64 length, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void CopyFileLocal( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& src_url, const storage::FileSystemURL& dest_url, CopyOrMoveOption option, const CopyFileProgressCallback& progress_callback, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void MoveFileLocal( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& src_url, const storage::FileSystemURL& dest_url, CopyOrMoveOption option, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void CopyInForeignFile( scoped_ptr<storage::FileSystemOperationContext> context, const base::FilePath& src_file_path, const storage::FileSystemURL& dest_url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void DeleteFile( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void DeleteDirectory( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void DeleteRecursively( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const StatusCallback& callback) OVERRIDE; + const StatusCallback& callback) override; virtual void CreateSnapshotFile( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const CreateSnapshotFileCallback& callback) OVERRIDE; + const CreateSnapshotFileCallback& callback) override; protected: virtual void CreateDirectoryOnTaskRunnerThread( diff --git a/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc b/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc index 2308f8a..31b1982 100644 --- a/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc +++ b/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc @@ -137,7 +137,7 @@ class TestPicasaDataProvider : public PicasaDataProvider { invalidate_callback_ = callback; } - virtual void InvalidateData() OVERRIDE { + virtual void InvalidateData() override { PicasaDataProvider::InvalidateData(); if (!invalidate_callback_.is_null()) { @@ -154,7 +154,7 @@ class TestPicasaDataProvider : public PicasaDataProvider { private: virtual void OnTempDirWatchStarted( - scoped_ptr<base::FilePathWatcher> temp_dir_watcher) OVERRIDE { + scoped_ptr<base::FilePathWatcher> temp_dir_watcher) override { PicasaDataProvider::OnTempDirWatchStarted(temp_dir_watcher.Pass()); file_watch_request_returned_ = true; @@ -279,10 +279,10 @@ class PicasaDataProviderTest : public InProcessBrowserTest { class PicasaDataProviderNoDatabaseGetListTest : public PicasaDataProviderTest { protected: - virtual PicasaDataProvider::DataType RequestedDataType() const OVERRIDE { + virtual PicasaDataProvider::DataType RequestedDataType() const override { return PicasaDataProvider::LIST_OF_ALBUMS_AND_FOLDERS_DATA; } - virtual void VerifyRefreshResults(bool parse_success) OVERRIDE { + virtual void VerifyRefreshResults(bool parse_success) override { EXPECT_FALSE(parse_success); TestDone(); } @@ -296,10 +296,10 @@ IN_PROC_BROWSER_TEST_F(PicasaDataProviderNoDatabaseGetListTest, class PicasaDataProviderNoDatabaseGetAlbumsImagesTest : public PicasaDataProviderTest { protected: - virtual PicasaDataProvider::DataType RequestedDataType() const OVERRIDE { + virtual PicasaDataProvider::DataType RequestedDataType() const override { return PicasaDataProvider::ALBUMS_IMAGES_DATA; } - virtual void VerifyRefreshResults(bool parse_success) OVERRIDE { + virtual void VerifyRefreshResults(bool parse_success) override { EXPECT_FALSE(parse_success); TestDone(); } @@ -312,16 +312,16 @@ IN_PROC_BROWSER_TEST_F(PicasaDataProviderNoDatabaseGetAlbumsImagesTest, class PicasaDataProviderGetListTest : public PicasaDataProviderTest { protected: - virtual void InitializeTestData() OVERRIDE { + virtual void InitializeTestData() override { WriteTestAlbumTable(GetColumnFileDestination(), test_folder_1_path(), test_folder_2_path()); } - virtual PicasaDataProvider::DataType RequestedDataType() const OVERRIDE { + virtual PicasaDataProvider::DataType RequestedDataType() const override { return PicasaDataProvider::LIST_OF_ALBUMS_AND_FOLDERS_DATA; } - virtual void VerifyRefreshResults(bool parse_success) OVERRIDE { + virtual void VerifyRefreshResults(bool parse_success) override { ASSERT_TRUE(parse_success); VerifyTestAlbumTable( data_provider(), test_folder_1_path(), test_folder_2_path()); @@ -335,17 +335,17 @@ IN_PROC_BROWSER_TEST_F(PicasaDataProviderGetListTest, GetListTest) { class PicasaDataProviderGetAlbumsImagesTest : public PicasaDataProviderTest { protected: - virtual void InitializeTestData() OVERRIDE { + virtual void InitializeTestData() override { WriteTestAlbumTable(GetColumnFileDestination(), test_folder_1_path(), test_folder_2_path()); WriteTestAlbumsImagesIndex(test_folder_1_path(), test_folder_2_path()); } - virtual PicasaDataProvider::DataType RequestedDataType() const OVERRIDE { + virtual PicasaDataProvider::DataType RequestedDataType() const override { return PicasaDataProvider::ALBUMS_IMAGES_DATA; } - virtual void VerifyRefreshResults(bool parse_success) OVERRIDE { + virtual void VerifyRefreshResults(bool parse_success) override { ASSERT_TRUE(parse_success); VerifyTestAlbumTable( data_provider(), test_folder_1_path(), test_folder_2_path()); @@ -366,13 +366,13 @@ class PicasaDataProviderMultipleMixedCallbacksTest PicasaDataProviderMultipleMixedCallbacksTest() : list_callbacks_called_(0), albums_images_callbacks_called_(0) {} - virtual void InitializeTestData() OVERRIDE { + virtual void InitializeTestData() override { WriteTestAlbumTable(GetColumnFileDestination(), test_folder_1_path(), test_folder_2_path()); WriteTestAlbumsImagesIndex(test_folder_1_path(), test_folder_2_path()); } - virtual PicasaDataProvider::DataType RequestedDataType() const OVERRIDE { + virtual PicasaDataProvider::DataType RequestedDataType() const override { return PicasaDataProvider::ALBUMS_IMAGES_DATA; } @@ -404,7 +404,7 @@ class PicasaDataProviderMultipleMixedCallbacksTest TestDone(); } - virtual void StartTestOnMediaTaskRunner() OVERRIDE { + virtual void StartTestOnMediaTaskRunner() override { DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); data_provider()->RefreshData( @@ -466,12 +466,12 @@ class PicasaDataProviderFileWatcherInvalidateTest data_provider()->MoveTempFilesToDatabase(); } - virtual base::FilePath GetColumnFileDestination() const OVERRIDE { + virtual base::FilePath GetColumnFileDestination() const override { return GetTempDirPath(); } private: - virtual void StartTestOnMediaTaskRunner() OVERRIDE { + virtual void StartTestOnMediaTaskRunner() override { DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); // Refresh before moving album table to database dir, guaranteeing failure. @@ -492,10 +492,10 @@ class PicasaDataProviderInvalidateInflightTableReaderTest : public PicasaDataProviderGetListTest { protected: // Don't write the database files until later. - virtual void InitializeTestData() OVERRIDE {} + virtual void InitializeTestData() override {} private: - virtual void StartTestOnMediaTaskRunner() OVERRIDE { + virtual void StartTestOnMediaTaskRunner() override { DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); // Refresh before the database files have been written. @@ -541,7 +541,7 @@ class PicasaDataProviderInvalidateInflightAlbumsIndexerTest } private: - virtual void StartTestOnMediaTaskRunner() OVERRIDE { + virtual void StartTestOnMediaTaskRunner() override { DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); data_provider()->RefreshData( diff --git a/chrome/browser/media_galleries/fileapi/picasa_file_util.h b/chrome/browser/media_galleries/fileapi/picasa_file_util.h index 490516c..279d093 100644 --- a/chrome/browser/media_galleries/fileapi/picasa_file_util.h +++ b/chrome/browser/media_galleries/fileapi/picasa_file_util.h @@ -35,30 +35,30 @@ class PicasaFileUtil : public NativeMediaFileUtil { virtual void GetFileInfoOnTaskRunnerThread( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const GetFileInfoCallback& callback) OVERRIDE; + const GetFileInfoCallback& callback) override; virtual void ReadDirectoryOnTaskRunnerThread( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - const ReadDirectoryCallback& callback) OVERRIDE; + const ReadDirectoryCallback& callback) override; virtual base::File::Error GetFileInfoSync( storage::FileSystemOperationContext* context, const storage::FileSystemURL& url, base::File::Info* file_info, - base::FilePath* platform_path) OVERRIDE; + base::FilePath* platform_path) override; virtual base::File::Error ReadDirectorySync( storage::FileSystemOperationContext* context, const storage::FileSystemURL& url, - EntryList* file_list) OVERRIDE; + EntryList* file_list) override; virtual base::File::Error DeleteDirectorySync( storage::FileSystemOperationContext* context, - const storage::FileSystemURL& url) OVERRIDE; + const storage::FileSystemURL& url) override; virtual base::File::Error DeleteFileSync( storage::FileSystemOperationContext* context, - const storage::FileSystemURL& url) OVERRIDE; + const storage::FileSystemURL& url) override; virtual base::File::Error GetLocalFilePath( storage::FileSystemOperationContext* context, const storage::FileSystemURL& url, - base::FilePath* local_file_path) OVERRIDE; + base::FilePath* local_file_path) override; private: void GetFileInfoWithFreshDataProvider( diff --git a/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc index 610f5fe..b773ee3 100644 --- a/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc @@ -192,7 +192,7 @@ class TestPicasaFileUtil : public PicasaFileUtil { } virtual ~TestPicasaFileUtil() {} private: - virtual PicasaDataProvider* GetDataProvider() OVERRIDE { + virtual PicasaDataProvider* GetDataProvider() override { return data_provider_; } @@ -208,7 +208,7 @@ class TestMediaFileSystemBackend : public MediaFileSystemBackend { test_file_util_(picasa_file_util) {} virtual storage::AsyncFileUtil* GetAsyncFileUtil( - storage::FileSystemType type) OVERRIDE { + storage::FileSystemType type) override { if (type != storage::kFileSystemTypePicasa) return NULL; @@ -226,7 +226,7 @@ class PicasaFileUtilTest : public testing::Test { } virtual ~PicasaFileUtilTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(profile_dir_.CreateUniqueTempDir()); ImportedMediaGalleryRegistry::GetInstance()->Initialize(); @@ -256,7 +256,7 @@ class PicasaFileUtilTest : public testing::Test { content::CreateAllowFileAccessOptions()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { SynchronouslyRunOnMediaTaskRunner( base::Bind(&PicasaFileUtilTest::TearDownOnMediaTaskRunner, base::Unretained(this))); diff --git a/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.h b/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.h index f2c0ddf..e3ea73a 100644 --- a/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.h +++ b/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.h @@ -22,9 +22,9 @@ class ReadaheadFileStreamReader // FileStreamReader overrides. virtual int Read(net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int64 GetLength( - const net::Int64CompletionCallback& callback) OVERRIDE; + const net::Int64CompletionCallback& callback) override; private: // Returns the number of bytes consumed from the internal cache into |sink|. diff --git a/chrome/browser/media_galleries/fileapi/safe_audio_video_checker.h b/chrome/browser/media_galleries/fileapi/safe_audio_video_checker.h index c798c22..b548349 100644 --- a/chrome/browser/media_galleries/fileapi/safe_audio_video_checker.h +++ b/chrome/browser/media_galleries/fileapi/safe_audio_video_checker.h @@ -48,8 +48,8 @@ class SafeAudioVideoChecker : public content::UtilityProcessHostClient { void OnCheckingFinished(bool valid); // UtilityProcessHostClient implementation. - virtual void OnProcessCrashed(int exit_code) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnProcessCrashed(int exit_code) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; State state_; diff --git a/chrome/browser/media_galleries/fileapi/safe_iapps_library_parser.h b/chrome/browser/media_galleries/fileapi/safe_iapps_library_parser.h index dc7abe9..91a9069 100644 --- a/chrome/browser/media_galleries/fileapi/safe_iapps_library_parser.h +++ b/chrome/browser/media_galleries/fileapi/safe_iapps_library_parser.h @@ -91,8 +91,8 @@ class SafeIAppsLibraryParser : public content::UtilityProcessHostClient { // UtilityProcessHostClient implementation. // Runs on the IO thread. - virtual void OnProcessCrashed(int exit_code) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnProcessCrashed(int exit_code) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; base::FilePath library_file_path_; diff --git a/chrome/browser/media_galleries/fileapi/safe_itunes_pref_parser_win.h b/chrome/browser/media_galleries/fileapi/safe_itunes_pref_parser_win.h index 632be61..7e5d70c 100644 --- a/chrome/browser/media_galleries/fileapi/safe_itunes_pref_parser_win.h +++ b/chrome/browser/media_galleries/fileapi/safe_itunes_pref_parser_win.h @@ -52,8 +52,8 @@ class SafeITunesPrefParserWin : public content::UtilityProcessHostClient { void OnGotITunesDirectory(const base::FilePath& library_file); // UtilityProcessHostClient implementation. - virtual void OnProcessCrashed(int exit_code) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnProcessCrashed(int exit_code) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; const std::string unsafe_xml_; const ParserCallback callback_; diff --git a/chrome/browser/media_galleries/fileapi/safe_media_metadata_parser.h b/chrome/browser/media_galleries/fileapi/safe_media_metadata_parser.h index eeada27..1e5b8a7 100644 --- a/chrome/browser/media_galleries/fileapi/safe_media_metadata_parser.h +++ b/chrome/browser/media_galleries/fileapi/safe_media_metadata_parser.h @@ -77,8 +77,8 @@ class SafeMediaMetadataParser : public content::UtilityProcessHostClient { // UtilityProcessHostClient implementation. // Runs on the IO thread. - virtual void OnProcessCrashed(int exit_code) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnProcessCrashed(int exit_code) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; // All member variables are only accessed on the IO thread. Profile* const profile_; diff --git a/chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.h b/chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.h index 283b14e..82845ae 100644 --- a/chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.h +++ b/chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.h @@ -69,8 +69,8 @@ class SafePicasaAlbumTableReader : public content::UtilityProcessHostClient { // UtilityProcessHostClient implementation. // Runs on the IO thread. - virtual void OnProcessCrashed(int exit_code) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnProcessCrashed(int exit_code) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; AlbumTableFiles album_table_files_; diff --git a/chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.h b/chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.h index 5cab2b7..e9b1317 100644 --- a/chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.h +++ b/chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.h @@ -62,8 +62,8 @@ class SafePicasaAlbumsIndexer : public content::UtilityProcessHostClient { // UtilityProcessHostClient implementation. // Runs on the IO thread. - virtual void OnProcessCrashed(int exit_code) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnProcessCrashed(int exit_code) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; AlbumUIDSet album_uids_; diff --git a/chrome/browser/media_galleries/fileapi/supported_audio_video_checker.h b/chrome/browser/media_galleries/fileapi/supported_audio_video_checker.h index 55f306c..6ed5ceb 100644 --- a/chrome/browser/media_galleries/fileapi/supported_audio_video_checker.h +++ b/chrome/browser/media_galleries/fileapi/supported_audio_video_checker.h @@ -26,7 +26,7 @@ class SupportedAudioVideoChecker : public AVScanningFileValidator { static bool SupportsFileType(const base::FilePath& path); virtual void StartPreWriteValidation( - const ResultCallback& result_callback) OVERRIDE; + const ResultCallback& result_callback) override; private: friend class MediaFileValidatorFactory; diff --git a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc index f216570..0b43513 100644 --- a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc +++ b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc @@ -62,12 +62,12 @@ class ImageDecoderDelegateAdapter : public ImageDecoder::Delegate { // ImageDecoder::Delegate methods. virtual void OnImageDecoded(const ImageDecoder* /*decoder*/, - const SkBitmap& /*decoded_image*/) OVERRIDE { + const SkBitmap& /*decoded_image*/) override { callback_.Run(base::File::FILE_OK); delete this; } - virtual void OnDecodeImageFailed(const ImageDecoder* /*decoder*/) OVERRIDE { + virtual void OnDecodeImageFailed(const ImageDecoder* /*decoder*/) override { callback_.Run(base::File::FILE_ERROR_SECURITY); delete this; } diff --git a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.h b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.h index 670a8af..6edbf17 100644 --- a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.h +++ b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.h @@ -24,7 +24,7 @@ class SupportedImageTypeValidator : public AVScanningFileValidator { static bool SupportsFileType(const base::FilePath& path); virtual void StartPreWriteValidation( - const ResultCallback& result_callback) OVERRIDE; + const ResultCallback& result_callback) override; private: friend class MediaFileValidatorFactory; diff --git a/chrome/browser/media_galleries/gallery_watch_manager.h b/chrome/browser/media_galleries/gallery_watch_manager.h index d8ba15a..fdcac72 100644 --- a/chrome/browser/media_galleries/gallery_watch_manager.h +++ b/chrome/browser/media_galleries/gallery_watch_manager.h @@ -125,13 +125,13 @@ class GalleryWatchManager // MediaGalleriesPreferences::GalleryChangeObserver implementation. virtual void OnPermissionRemoved(MediaGalleriesPreferences* pref, const std::string& extension_id, - MediaGalleryPrefId pref_id) OVERRIDE; + MediaGalleryPrefId pref_id) override; virtual void OnGalleryRemoved(MediaGalleriesPreferences* pref, - MediaGalleryPrefId pref_id) OVERRIDE; + MediaGalleryPrefId pref_id) override; // storage_monitor::RemovableStorageObserver implementation. virtual void OnRemovableStorageDetached( - const storage_monitor::StorageInfo& info) OVERRIDE; + const storage_monitor::StorageInfo& info) override; // True if the we are already observing the storage monitor. bool storage_monitor_observed_; diff --git a/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc b/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc index ad11b80..2a6a0ea 100644 --- a/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc +++ b/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc @@ -61,7 +61,7 @@ class GalleryWatchManagerTest : public GalleryWatchManagerObserver, virtual ~GalleryWatchManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(storage_monitor::TestStorageMonitor::CreateAndInstall()); extensions::TestExtensionSystem* extension_system( @@ -85,7 +85,7 @@ class GalleryWatchManagerTest : public GalleryWatchManagerObserver, manager_->AddObserver(profile_.get(), this); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { manager_->RemoveObserver(profile_.get()); manager_.reset(); storage_monitor::TestStorageMonitor::Destroy(); @@ -149,13 +149,13 @@ class GalleryWatchManagerTest : public GalleryWatchManagerObserver, private: // GalleryWatchManagerObserver implementation. virtual void OnGalleryChanged(const std::string& extension_id, - MediaGalleryPrefId gallery_id) OVERRIDE { + MediaGalleryPrefId gallery_id) override { EXPECT_TRUE(expect_gallery_changed_); pending_loop_->Quit(); } virtual void OnGalleryWatchDropped(const std::string& extension_id, - MediaGalleryPrefId gallery_id) OVERRIDE { + MediaGalleryPrefId gallery_id) override { EXPECT_TRUE(expect_gallery_watch_dropped_); pending_loop_->Quit(); } diff --git a/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h b/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h index f988a3fd..f8bab83 100644 --- a/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h +++ b/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h @@ -74,24 +74,24 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate { // MTPDeviceAsyncDelegate: virtual void GetFileInfo(const base::FilePath& file_path, const GetFileInfoSuccessCallback& success_callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void ReadDirectory( const base::FilePath& root, const ReadDirectorySuccessCallback& success_callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void CreateSnapshotFile( const base::FilePath& device_file_path, const base::FilePath& local_path, const CreateSnapshotFileSuccessCallback& success_callback, - const ErrorCallback& error_callback) OVERRIDE; - virtual bool IsStreaming() OVERRIDE; + const ErrorCallback& error_callback) override; + virtual bool IsStreaming() override; virtual void ReadBytes(const base::FilePath& device_file_path, const scoped_refptr<net::IOBuffer>& buf, int64 offset, int buf_len, const ReadBytesSuccessCallback& success_callback, - const ErrorCallback& error_callback) OVERRIDE; - virtual void CancelPendingTasksAndDeleteDelegate() OVERRIDE; + const ErrorCallback& error_callback) override; + virtual void CancelPendingTasksAndDeleteDelegate() override; // The internal methods correspond to the similarly named methods above. // The |root_node_| cache should be filled at this point. diff --git a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.h b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.h index af94976..106a647 100644 --- a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.h +++ b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.h @@ -35,28 +35,28 @@ class MTPDeviceDelegateImplMac : public MTPDeviceAsyncDelegate { virtual void GetFileInfo( const base::FilePath& file_path, const GetFileInfoSuccessCallback& success_callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; // Note: passed absolute paths, but expects relative paths in reply. virtual void ReadDirectory( const base::FilePath& root, const ReadDirectorySuccessCallback& success_callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; // Note: passed absolute paths. virtual void CreateSnapshotFile( const base::FilePath& device_file_path, const base::FilePath& local_path, const CreateSnapshotFileSuccessCallback& success_callback, - const ErrorCallback& error_callback) OVERRIDE; - virtual bool IsStreaming() OVERRIDE; + const ErrorCallback& error_callback) override; + virtual bool IsStreaming() override; virtual void ReadBytes(const base::FilePath& device_file_path, const scoped_refptr<net::IOBuffer>& buf, int64 offset, int buf_len, const ReadBytesSuccessCallback& success_callback, - const ErrorCallback& error_callback) OVERRIDE; - virtual void CancelPendingTasksAndDeleteDelegate() OVERRIDE; + const ErrorCallback& error_callback) override; + virtual void CancelPendingTasksAndDeleteDelegate() override; // Forward delegates for ImageCaptureDeviceListener. These are // invoked in callbacks of the ImageCapture library on the UI thread. diff --git a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm index e829a3e..da9f06a 100644 --- a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm +++ b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm @@ -47,11 +47,11 @@ class MTPDeviceDelegateImplMac::DeviceListener // ImageCaptureDeviceListener virtual void ItemAdded(const std::string& name, - const base::File::Info& info) OVERRIDE; - virtual void NoMoreItems() OVERRIDE; + const base::File::Info& info) override; + virtual void NoMoreItems() override; virtual void DownloadedFile(const std::string& name, - base::File::Error error) OVERRIDE; - virtual void DeviceRemoved() OVERRIDE; + base::File::Error error) override; + virtual void DeviceRemoved() override; // Used during delegate destruction to ensure there are no more calls // to the delegate by the listener. diff --git a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm index 3b94e53..56290d8 100644 --- a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm +++ b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm @@ -153,7 +153,7 @@ class MTPDeviceDelegateImplMacTest : public testing::Test { public: MTPDeviceDelegateImplMacTest() : camera_(NULL), delegate_(NULL) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ui_thread_.reset(new content::TestBrowserThread( content::BrowserThread::UI, &message_loop_)); file_thread_.reset(new content::TestBrowserThread( @@ -173,7 +173,7 @@ class MTPDeviceDelegateImplMacTest : public testing::Test { delegate_ = new MTPDeviceDelegateImplMac(kDeviceId, kDevicePath); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { id<ICDeviceBrowserDelegate> delegate = manager_.device_browser(); [delegate deviceBrowser:nil didRemoveDevice:camera_ moreGoing:NO]; diff --git a/chrome/browser/media_galleries/media_file_system_registry.cc b/chrome/browser/media_galleries/media_file_system_registry.cc index 43c5845..cd4cd13 100644 --- a/chrome/browser/media_galleries/media_file_system_registry.cc +++ b/chrome/browser/media_galleries/media_file_system_registry.cc @@ -86,9 +86,9 @@ class RPHReferenceManager { private: // content::WebContentsObserver - virtual void WebContentsDestroyed() OVERRIDE; + virtual void WebContentsDestroyed() override; virtual void NavigationEntryCommitted( - const content::LoadCommittedDetails& load_details) OVERRIDE; + const content::LoadCommittedDetails& load_details) override; RPHReferenceManager* manager_; }; @@ -105,7 +105,7 @@ class RPHReferenceManager { } private: - virtual void RenderProcessHostDestroyed(RenderProcessHost* host) OVERRIDE; + virtual void RenderProcessHostDestroyed(RenderProcessHost* host) override; RPHReferenceManager* manager_; RenderProcessHost* host_; @@ -639,7 +639,7 @@ class MediaFileSystemRegistry::MediaFileSystemContextImpl virtual bool RegisterFileSystem(const std::string& device_id, const std::string& fs_name, - const base::FilePath& path) OVERRIDE { + const base::FilePath& path) override { if (StorageInfo::IsMassStorageDevice(device_id)) { return RegisterFileSystemForMassStorage(device_id, fs_name, path); } else { @@ -647,7 +647,7 @@ class MediaFileSystemRegistry::MediaFileSystemContextImpl } } - virtual void RevokeFileSystem(const std::string& fs_name) OVERRIDE { + virtual void RevokeFileSystem(const std::string& fs_name) override { ImportedMediaGalleryRegistry* imported_registry = ImportedMediaGalleryRegistry::GetInstance(); if (imported_registry->RevokeImportedFilesystemOnUIThread(fs_name)) @@ -662,7 +662,7 @@ class MediaFileSystemRegistry::MediaFileSystemContextImpl } virtual base::FilePath GetRegisteredPath( - const std::string& fs_name) const OVERRIDE { + const std::string& fs_name) const override { base::FilePath result; if (!ExternalMountPoints::GetSystemInstance()->GetRegisteredPath(fs_name, &result)) { diff --git a/chrome/browser/media_galleries/media_file_system_registry.h b/chrome/browser/media_galleries/media_file_system_registry.h index 8c120d4..6398e34 100644 --- a/chrome/browser/media_galleries/media_file_system_registry.h +++ b/chrome/browser/media_galleries/media_file_system_registry.h @@ -100,7 +100,7 @@ class MediaFileSystemRegistry // RemovableStorageObserver implementation. virtual void OnRemovableStorageDetached( - const storage_monitor::StorageInfo& info) OVERRIDE; + const storage_monitor::StorageInfo& info) override; private: class MediaFileSystemContextImpl; @@ -117,9 +117,9 @@ class MediaFileSystemRegistry virtual void OnPermissionRemoved(MediaGalleriesPreferences* pref, const std::string& extension_id, - MediaGalleryPrefId pref_id) OVERRIDE; + MediaGalleryPrefId pref_id) override; virtual void OnGalleryRemoved(MediaGalleriesPreferences* pref, - MediaGalleryPrefId pref_id) OVERRIDE; + MediaGalleryPrefId pref_id) override; // Look up or create the extension gallery host. ExtensionGalleriesHost* GetExtensionGalleryHost( diff --git a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc index 0160fc0..e63ce00 100644 --- a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc +++ b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc @@ -80,12 +80,12 @@ class TestMediaFileSystemContext : public MediaFileSystemContext { // MediaFileSystemContext implementation. virtual bool RegisterFileSystem(const std::string& device_id, const std::string& fs_name, - const base::FilePath& path) OVERRIDE; + const base::FilePath& path) override; - virtual void RevokeFileSystem(const std::string& fs_name) OVERRIDE; + virtual void RevokeFileSystem(const std::string& fs_name) override; virtual base::FilePath GetRegisteredPath( - const std::string& fs_name) const OVERRIDE; + const std::string& fs_name) const override; MediaFileSystemRegistry* registry() { return registry_; } @@ -201,7 +201,7 @@ class MockProfileSharedRenderProcessHostFactory virtual content::RenderProcessHost* CreateRenderProcessHost( content::BrowserContext* browser_context, - content::SiteInstance* site_instance) const OVERRIDE; + content::SiteInstance* site_instance) const override; private: typedef std::map<content::BrowserContext*, content::MockRenderProcessHost*> @@ -350,8 +350,8 @@ class MediaFileSystemRegistryTest : public ChromeRenderViewHostTestHarness { } protected: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; private: // This makes sure that at least one default gallery exists on the file diff --git a/chrome/browser/media_galleries/media_folder_finder_unittest.cc b/chrome/browser/media_galleries/media_folder_finder_unittest.cc index b994956..74a2655 100644 --- a/chrome/browser/media_galleries/media_folder_finder_unittest.cc +++ b/chrome/browser/media_galleries/media_folder_finder_unittest.cc @@ -28,11 +28,11 @@ class MediaFolderFinderTest : public testing::Test { virtual ~MediaFolderFinderTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(fake_dir_.CreateUniqueTempDir()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { ASSERT_EQ(NULL, media_folder_finder_.get()); } diff --git a/chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h b/chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h index 1f2d5a4..a829b4b 100644 --- a/chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h +++ b/chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h @@ -16,14 +16,14 @@ class MockMediaGalleriesDialog : public MediaGalleriesDialog { virtual ~MockMediaGalleriesDialog(); // MediaGalleriesDialog implementation. - virtual void UpdateGalleries() OVERRIDE; + virtual void UpdateGalleries() override; // Number up times UpdateResults has been called. int update_count() const; private: // MediaGalleriesDialog implementation. - virtual void AcceptDialogForTesting() OVERRIDE; + virtual void AcceptDialogForTesting() override; int update_count_; diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller.h b/chrome/browser/media_galleries/media_galleries_permission_controller.h index a1163a6..46bedbf 100644 --- a/chrome/browser/media_galleries/media_galleries_permission_controller.h +++ b/chrome/browser/media_galleries/media_galleries_permission_controller.h @@ -55,23 +55,23 @@ class MediaGalleriesPermissionController const base::Closure& on_finish); // MediaGalleriesDialogController implementation. - virtual base::string16 GetHeader() const OVERRIDE; - virtual base::string16 GetSubtext() const OVERRIDE; - virtual bool IsAcceptAllowed() const OVERRIDE; - virtual bool ShouldShowFolderViewer(const Entry& entry) const OVERRIDE; - virtual std::vector<base::string16> GetSectionHeaders() const OVERRIDE; - virtual Entries GetSectionEntries(size_t index) const OVERRIDE; + virtual base::string16 GetHeader() const override; + virtual base::string16 GetSubtext() const override; + virtual bool IsAcceptAllowed() const override; + virtual bool ShouldShowFolderViewer(const Entry& entry) const override; + virtual std::vector<base::string16> GetSectionHeaders() const override; + virtual Entries GetSectionEntries(size_t index) const override; // Auxiliary button for this dialog is the 'Add Folder' button. - virtual base::string16 GetAuxiliaryButtonText() const OVERRIDE; - virtual void DidClickAuxiliaryButton() OVERRIDE; + virtual base::string16 GetAuxiliaryButtonText() const override; + virtual void DidClickAuxiliaryButton() override; virtual void DidToggleEntry(GalleryDialogId gallery_id, - bool selected) OVERRIDE; - virtual void DidClickOpenFolderViewer(GalleryDialogId gallery_id) OVERRIDE; - virtual void DidForgetEntry(GalleryDialogId gallery_id) OVERRIDE; - virtual base::string16 GetAcceptButtonText() const OVERRIDE; - virtual void DialogFinished(bool accepted) OVERRIDE; - virtual ui::MenuModel* GetContextMenu(GalleryDialogId gallery_id) OVERRIDE; - virtual content::WebContents* WebContents() OVERRIDE; + bool selected) override; + virtual void DidClickOpenFolderViewer(GalleryDialogId gallery_id) override; + virtual void DidForgetEntry(GalleryDialogId gallery_id) override; + virtual base::string16 GetAcceptButtonText() const override; + virtual void DialogFinished(bool accepted) override; + virtual ui::MenuModel* GetContextMenu(GalleryDialogId gallery_id) override; + virtual content::WebContents* WebContents() override; protected: friend class MediaGalleriesPermissionControllerTest; @@ -114,29 +114,29 @@ class MediaGalleriesPermissionController // SelectFileDialog::Listener implementation: virtual void FileSelected(const base::FilePath& path, int index, - void* params) OVERRIDE; + void* params) override; // RemovableStorageObserver implementation. // Used to keep dialog in sync with removable device status. virtual void OnRemovableStorageAttached( - const storage_monitor::StorageInfo& info) OVERRIDE; + const storage_monitor::StorageInfo& info) override; virtual void OnRemovableStorageDetached( - const storage_monitor::StorageInfo& info) OVERRIDE; + const storage_monitor::StorageInfo& info) override; // MediaGalleriesPreferences::GalleryChangeObserver implementations. // Used to keep the dialog in sync when the preferences change. virtual void OnPermissionAdded(MediaGalleriesPreferences* pref, const std::string& extension_id, - MediaGalleryPrefId pref_id) OVERRIDE; + MediaGalleryPrefId pref_id) override; virtual void OnPermissionRemoved(MediaGalleriesPreferences* pref, const std::string& extension_id, - MediaGalleryPrefId pref_id) OVERRIDE; + MediaGalleryPrefId pref_id) override; virtual void OnGalleryAdded(MediaGalleriesPreferences* pref, - MediaGalleryPrefId pref_id) OVERRIDE; + MediaGalleryPrefId pref_id) override; virtual void OnGalleryRemoved(MediaGalleriesPreferences* pref, - MediaGalleryPrefId pref_id) OVERRIDE; + MediaGalleryPrefId pref_id) override; virtual void OnGalleryInfoUpdated(MediaGalleriesPreferences* pref, - MediaGalleryPrefId pref_id) OVERRIDE; + MediaGalleryPrefId pref_id) override; // Populates |known_galleries_| from |preferences_|. Subsequent calls merge // into |known_galleries_| and do not change permissions for user toggled diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc b/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc index 7246aee..bc04115 100644 --- a/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc @@ -54,7 +54,7 @@ class MediaGalleriesPermissionControllerTest : public ::testing::Test { EXPECT_FALSE(dialog_); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(TestStorageMonitor::CreateAndInstall()); extensions::TestExtensionSystem* extension_system( @@ -74,7 +74,7 @@ class MediaGalleriesPermissionControllerTest : public ::testing::Test { extension_ = AddMediaGalleriesApp("read", read_permissions, profile_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { TestStorageMonitor::Destroy(); } diff --git a/chrome/browser/media_galleries/media_galleries_permissions_unittest.cc b/chrome/browser/media_galleries/media_galleries_permissions_unittest.cc index bdc0c17..d280a63 100644 --- a/chrome/browser/media_galleries/media_galleries_permissions_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_permissions_unittest.cc @@ -40,7 +40,7 @@ class MediaGalleriesPermissionsTest : public extensions::ExtensionPrefsTest { // This is the same implementation as ExtensionPrefsTest::TearDown(), except // for also resetting the ExtensionPrefs used by |gallery_prefs_| after // TestExtensionPrefs reconstructs them. - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { Verify(); // Reset ExtensionPrefs, and re-verify. @@ -57,7 +57,7 @@ class MediaGalleriesPermissionsTest : public extensions::ExtensionPrefsTest { testing::Test::TearDown(); } - virtual void Initialize() OVERRIDE { + virtual void Initialize() override { file_thread_.Start(); ASSERT_TRUE(storage_monitor::TestStorageMonitor::CreateAndInstall()); @@ -110,7 +110,7 @@ class MediaGalleriesPermissionsTest : public extensions::ExtensionPrefsTest { Verify(); } - virtual void Verify() OVERRIDE { + virtual void Verify() override { struct TestData { std::string* id; std::vector<MediaGalleryPermission>* expectation; diff --git a/chrome/browser/media_galleries/media_galleries_preferences.h b/chrome/browser/media_galleries/media_galleries_preferences.h index 2e84ee9..6ed8da5 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.h +++ b/chrome/browser/media_galleries/media_galleries_preferences.h @@ -201,7 +201,7 @@ class MediaGalleriesPreferences // RemovableStorageObserver implementation. virtual void OnRemovableStorageAttached( - const storage_monitor::StorageInfo& info) OVERRIDE; + const storage_monitor::StorageInfo& info) override; // Lookup a media gallery and fill in information about it and return true if // it exists. Return false if it does not, filling in default information. @@ -277,7 +277,7 @@ class MediaGalleriesPreferences void SetLastScanCompletionTime(const base::Time& time); // KeyedService implementation: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); diff --git a/chrome/browser/media_galleries/media_galleries_preferences_factory.h b/chrome/browser/media_galleries/media_galleries_preferences_factory.h index cff471e..e044522 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences_factory.h +++ b/chrome/browser/media_galleries/media_galleries_preferences_factory.h @@ -31,11 +31,11 @@ class MediaGalleriesPreferencesFactory // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; virtual void RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) OVERRIDE; + user_prefs::PrefRegistrySyncable* registry) override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPreferencesFactory); }; diff --git a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc index bfc5f71..e9edc4b 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc @@ -63,32 +63,32 @@ class MockGalleryChangeObserver // MediaGalleriesPreferences::GalleryChangeObserver implementation. virtual void OnPermissionAdded(MediaGalleriesPreferences* pref, const std::string& extension_id, - MediaGalleryPrefId pref_id) OVERRIDE { + MediaGalleryPrefId pref_id) override { EXPECT_EQ(pref_, pref); ++notifications_; } virtual void OnPermissionRemoved(MediaGalleriesPreferences* pref, const std::string& extension_id, - MediaGalleryPrefId pref_id) OVERRIDE { + MediaGalleryPrefId pref_id) override { EXPECT_EQ(pref_, pref); ++notifications_; } virtual void OnGalleryAdded(MediaGalleriesPreferences* pref, - MediaGalleryPrefId pref_id) OVERRIDE { + MediaGalleryPrefId pref_id) override { EXPECT_EQ(pref_, pref); ++notifications_; } virtual void OnGalleryRemoved(MediaGalleriesPreferences* pref, - MediaGalleryPrefId pref_id) OVERRIDE { + MediaGalleryPrefId pref_id) override { EXPECT_EQ(pref_, pref); ++notifications_; } virtual void OnGalleryInfoUpdated(MediaGalleriesPreferences* pref, - MediaGalleryPrefId pref_id) OVERRIDE { + MediaGalleryPrefId pref_id) override { EXPECT_EQ(pref_, pref); ++notifications_; } @@ -114,7 +114,7 @@ class MediaGalleriesPreferencesTest : public testing::Test { virtual ~MediaGalleriesPreferencesTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(TestStorageMonitor::CreateAndInstall()); extensions::TestExtensionSystem* extension_system( @@ -148,7 +148,7 @@ class MediaGalleriesPreferencesTest : public testing::Test { AddMediaGalleriesApp("no", read_permissions, profile_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { Verify(); TestStorageMonitor::Destroy(); } diff --git a/chrome/browser/media_galleries/media_galleries_scan_result_controller.h b/chrome/browser/media_galleries/media_galleries_scan_result_controller.h index 2805824..41afc21 100644 --- a/chrome/browser/media_galleries/media_galleries_scan_result_controller.h +++ b/chrome/browser/media_galleries/media_galleries_scan_result_controller.h @@ -52,21 +52,21 @@ class MediaGalleriesScanResultController const base::Closure& on_finish); // MediaGalleriesDialogController implementation. - virtual base::string16 GetHeader() const OVERRIDE; - virtual base::string16 GetSubtext() const OVERRIDE; - virtual bool IsAcceptAllowed() const OVERRIDE; - virtual bool ShouldShowFolderViewer(const Entry& entry) const OVERRIDE; - virtual std::vector<base::string16> GetSectionHeaders() const OVERRIDE; - virtual Entries GetSectionEntries(size_t index) const OVERRIDE; - virtual base::string16 GetAuxiliaryButtonText() const OVERRIDE; - virtual void DidClickAuxiliaryButton() OVERRIDE; - virtual void DidToggleEntry(MediaGalleryPrefId id, bool selected) OVERRIDE; - virtual void DidClickOpenFolderViewer(MediaGalleryPrefId id) OVERRIDE; - virtual void DidForgetEntry(MediaGalleryPrefId id) OVERRIDE; - virtual base::string16 GetAcceptButtonText() const OVERRIDE; - virtual void DialogFinished(bool accepted) OVERRIDE; - virtual ui::MenuModel* GetContextMenu(MediaGalleryPrefId id) OVERRIDE; - virtual content::WebContents* WebContents() OVERRIDE; + virtual base::string16 GetHeader() const override; + virtual base::string16 GetSubtext() const override; + virtual bool IsAcceptAllowed() const override; + virtual bool ShouldShowFolderViewer(const Entry& entry) const override; + virtual std::vector<base::string16> GetSectionHeaders() const override; + virtual Entries GetSectionEntries(size_t index) const override; + virtual base::string16 GetAuxiliaryButtonText() const override; + virtual void DidClickAuxiliaryButton() override; + virtual void DidToggleEntry(MediaGalleryPrefId id, bool selected) override; + virtual void DidClickOpenFolderViewer(MediaGalleryPrefId id) override; + virtual void DidForgetEntry(MediaGalleryPrefId id) override; + virtual base::string16 GetAcceptButtonText() const override; + virtual void DialogFinished(bool accepted) override; + virtual ui::MenuModel* GetContextMenu(MediaGalleryPrefId id) override; + virtual content::WebContents* WebContents() override; protected: typedef base::Callback<MediaGalleriesDialog* ( @@ -109,24 +109,24 @@ class MediaGalleriesScanResultController // RemovableStorageObserver implementation. // Used to keep dialog in sync with removable device status. virtual void OnRemovableStorageAttached( - const storage_monitor::StorageInfo& info) OVERRIDE; + const storage_monitor::StorageInfo& info) override; virtual void OnRemovableStorageDetached( - const storage_monitor::StorageInfo& info) OVERRIDE; + const storage_monitor::StorageInfo& info) override; // MediaGalleriesPreferences::GalleryChangeObserver implementations. // Used to keep the dialog in sync when the preferences change. virtual void OnPermissionAdded(MediaGalleriesPreferences* pref, const std::string& extension_id, - MediaGalleryPrefId pref_id) OVERRIDE; + MediaGalleryPrefId pref_id) override; virtual void OnPermissionRemoved(MediaGalleriesPreferences* pref, const std::string& extension_id, - MediaGalleryPrefId pref_id) OVERRIDE; + MediaGalleryPrefId pref_id) override; virtual void OnGalleryAdded(MediaGalleriesPreferences* pref, - MediaGalleryPrefId pref_id) OVERRIDE; + MediaGalleryPrefId pref_id) override; virtual void OnGalleryRemoved(MediaGalleriesPreferences* pref, - MediaGalleryPrefId pref_id) OVERRIDE; + MediaGalleryPrefId pref_id) override; virtual void OnGalleryInfoUpdated(MediaGalleriesPreferences* pref, - MediaGalleryPrefId pref_id) OVERRIDE; + MediaGalleryPrefId pref_id) override; // The web contents from which the request originated. content::WebContents* web_contents_; diff --git a/chrome/browser/media_galleries/media_galleries_scan_result_controller_unittest.cc b/chrome/browser/media_galleries/media_galleries_scan_result_controller_unittest.cc index 026715d..8d1a4ee 100644 --- a/chrome/browser/media_galleries/media_galleries_scan_result_controller_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_scan_result_controller_unittest.cc @@ -45,7 +45,7 @@ class MediaGalleriesScanResultControllerTest : public testing::Test { EXPECT_FALSE(dialog_); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(storage_monitor::TestStorageMonitor::CreateAndInstall()); extensions::TestExtensionSystem* extension_system( @@ -65,7 +65,7 @@ class MediaGalleriesScanResultControllerTest : public testing::Test { extension_ = AddMediaGalleriesApp("read", read_permissions, profile_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { storage_monitor::TestStorageMonitor::Destroy(); } diff --git a/chrome/browser/media_galleries/media_gallery_context_menu.h b/chrome/browser/media_galleries/media_gallery_context_menu.h index cf2caa3..0c87f90 100644 --- a/chrome/browser/media_galleries/media_gallery_context_menu.h +++ b/chrome/browser/media_galleries/media_gallery_context_menu.h @@ -24,12 +24,12 @@ class MediaGalleryContextMenu : public ui::SimpleMenuModel, } // ui::SimpleMenuModel::Delegate overrides: - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; - virtual bool IsCommandIdVisible(int command_id) const OVERRIDE; + virtual bool IsCommandIdChecked(int command_id) const override; + virtual bool IsCommandIdEnabled(int command_id) const override; + virtual bool IsCommandIdVisible(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; + int command_id, ui::Accelerator* accelerator) override; + virtual void ExecuteCommand(int command_id, int event_flags) override; private: MediaGalleryPrefId pref_id_; diff --git a/chrome/browser/media_galleries/media_scan_manager.h b/chrome/browser/media_galleries/media_scan_manager.h index 0ff0f45..80509ce 100644 --- a/chrome/browser/media_galleries/media_scan_manager.h +++ b/chrome/browser/media_galleries/media_scan_manager.h @@ -79,7 +79,7 @@ class MediaScanManager : public extensions::ExtensionRegistryObserver { virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const extensions::Extension* extension, - extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE; + extensions::UnloadedExtensionInfo::Reason reason) override; bool ScanInProgress() const; diff --git a/chrome/browser/media_galleries/media_scan_manager_unittest.cc b/chrome/browser/media_galleries/media_scan_manager_unittest.cc index 54fe47e..1f445cc 100644 --- a/chrome/browser/media_galleries/media_scan_manager_unittest.cc +++ b/chrome/browser/media_galleries/media_scan_manager_unittest.cc @@ -60,7 +60,7 @@ class MockMediaFolderFinder : MediaFolderFinder { destruction_callback_.Run(); } - virtual void StartScan() OVERRIDE { + virtual void StartScan() override { started_callback_.Run(callback_); } @@ -103,7 +103,7 @@ class MediaScanManagerTest : public MediaScanManagerObserver, EXPECT_EQ(find_folders_start_count_, find_folders_destroy_count_); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(storage_monitor::TestStorageMonitor::CreateAndInstall()); extensions::TestExtensionSystem* extension_system( @@ -138,7 +138,7 @@ class MediaScanManagerTest : public MediaScanManagerObserver, media_scan_manager_->AddObserver(profile_.get(), this); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { media_scan_manager_->RemoveObserver(profile_.get()); media_scan_manager_.reset(); storage_monitor::TestStorageMonitor::Destroy(); @@ -234,7 +234,7 @@ class MediaScanManagerTest : public MediaScanManagerObserver, virtual void OnScanFinished( const std::string& extension_id, int gallery_count, - const MediaGalleryScanResult& file_counts) OVERRIDE { + const MediaGalleryScanResult& file_counts) override { EXPECT_EQ(extension_->id(), extension_id); EXPECT_EQ(expected_gallery_count_, gallery_count); EXPECT_EQ(expected_file_counts_.audio_count, file_counts.audio_count); diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h index 660a90b..f1ca860 100644 --- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h +++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h @@ -93,24 +93,24 @@ class MTPDeviceDelegateImplWin : public MTPDeviceAsyncDelegate { virtual void GetFileInfo( const base::FilePath& file_path, const GetFileInfoSuccessCallback& success_callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void ReadDirectory( const base::FilePath& root, const ReadDirectorySuccessCallback& success_callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void CreateSnapshotFile( const base::FilePath& device_file_path, const base::FilePath& local_path, const CreateSnapshotFileSuccessCallback& success_callback, - const ErrorCallback& error_callback) OVERRIDE; - virtual bool IsStreaming() OVERRIDE; + const ErrorCallback& error_callback) override; + virtual bool IsStreaming() override; virtual void ReadBytes(const base::FilePath& device_file_path, const scoped_refptr<net::IOBuffer>& buf, int64 offset, int buf_len, const ReadBytesSuccessCallback& success_callback, - const ErrorCallback& error_callback) OVERRIDE; - virtual void CancelPendingTasksAndDeleteDelegate() OVERRIDE; + const ErrorCallback& error_callback) override; + virtual void CancelPendingTasksAndDeleteDelegate() override; // Ensures the device is initialized for communication by doing a // call-and-reply to a blocking pool thread. |task_info.task| runs on a diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc index ab98bc8..4c904ef 100644 --- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc +++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc @@ -53,8 +53,8 @@ void GetGalleryInfoCallback( class MTPDeviceDelegateImplWinTest : public ChromeRenderViewHostTestHarness { protected: - void SetUp() OVERRIDE; - void TearDown() OVERRIDE; + void SetUp() override; + void TearDown() override; void ProcessAttach(const std::string& id, const base::string16& name, diff --git a/chrome/browser/metrics/android_metrics_provider.h b/chrome/browser/metrics/android_metrics_provider.h index 8b004da..31a2dbe 100644 --- a/chrome/browser/metrics/android_metrics_provider.h +++ b/chrome/browser/metrics/android_metrics_provider.h @@ -25,7 +25,7 @@ class AndroidMetricsProvider : public metrics::MetricsProvider { // metrics::MetricsDataProvider: virtual void ProvideStabilityMetrics( - metrics::SystemProfileProto* system_profile_proto) OVERRIDE; + metrics::SystemProfileProto* system_profile_proto) override; // Registers local state prefs used by this class. static void RegisterPrefs(PrefRegistrySimple* registry); diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h index 0e4fdbb..04f3f0e 100644 --- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h +++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h @@ -22,9 +22,9 @@ class ChromeBrowserMainExtraPartsMetrics : public ChromeBrowserMainExtraParts { virtual ~ChromeBrowserMainExtraPartsMetrics(); // Overridden from ChromeBrowserMainExtraParts: - virtual void PreProfileInit() OVERRIDE; - virtual void PreBrowserStart() OVERRIDE; - virtual void PostBrowserStart() OVERRIDE; + virtual void PreProfileInit() override; + virtual void PreBrowserStart() override; + virtual void PostBrowserStart() override; private: DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsMetrics); diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc index 051f41b..182441c 100644 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc @@ -106,7 +106,7 @@ class MetricsMemoryDetails : public MemoryDetails { SetMemoryGrowthTracker(memory_growth_tracker); } - virtual void OnDetailsAvailable() OVERRIDE { + virtual void OnDetailsAvailable() override { base::MessageLoop::current()->PostTask(FROM_HERE, callback_); } diff --git a/chrome/browser/metrics/chrome_metrics_service_client.h b/chrome/browser/metrics/chrome_metrics_service_client.h index 6f2f251..0ef6294 100644 --- a/chrome/browser/metrics/chrome_metrics_service_client.h +++ b/chrome/browser/metrics/chrome_metrics_service_client.h @@ -56,23 +56,23 @@ class ChromeMetricsServiceClient static void RegisterPrefs(PrefRegistrySimple* registry); // metrics::MetricsServiceClient: - virtual void SetMetricsClientId(const std::string& client_id) OVERRIDE; - virtual bool IsOffTheRecordSessionActive() OVERRIDE; - virtual int32 GetProduct() OVERRIDE; - virtual std::string GetApplicationLocale() OVERRIDE; - virtual bool GetBrand(std::string* brand_code) OVERRIDE; - virtual metrics::SystemProfileProto::Channel GetChannel() OVERRIDE; - virtual std::string GetVersionString() OVERRIDE; - virtual void OnLogUploadComplete() OVERRIDE; + virtual void SetMetricsClientId(const std::string& client_id) override; + virtual bool IsOffTheRecordSessionActive() override; + virtual int32 GetProduct() override; + virtual std::string GetApplicationLocale() override; + virtual bool GetBrand(std::string* brand_code) override; + virtual metrics::SystemProfileProto::Channel GetChannel() override; + virtual std::string GetVersionString() override; + virtual void OnLogUploadComplete() override; virtual void StartGatheringMetrics( - const base::Closure& done_callback) OVERRIDE; + const base::Closure& done_callback) override; virtual void CollectFinalMetrics(const base::Closure& done_callback) - OVERRIDE; + override; virtual scoped_ptr<metrics::MetricsLogUploader> CreateUploader( const std::string& server_url, const std::string& mime_type, - const base::Callback<void(int)>& on_upload_complete) OVERRIDE; - virtual base::string16 GetRegistryBackupKey() OVERRIDE; + const base::Callback<void(int)>& on_upload_complete) override; + virtual base::string16 GetRegistryBackupKey() override; metrics::MetricsService* metrics_service() { return metrics_service_.get(); } @@ -99,8 +99,8 @@ class ChromeMetricsServiceClient // TrackingSynchronizerObserver: virtual void ReceivedProfilerData( const tracked_objects::ProcessDataSnapshot& process_data, - int process_type) OVERRIDE; - virtual void FinishedReceivingProfilerData() OVERRIDE; + int process_type) override; + virtual void FinishedReceivingProfilerData() override; // Callbacks for various stages of final log info collection. Do not call // these directly. @@ -119,7 +119,7 @@ class ChromeMetricsServiceClient // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; #if defined(OS_WIN) // Counts (and removes) the browser crash dump attempt signals left behind by diff --git a/chrome/browser/metrics/chrome_stability_metrics_provider.h b/chrome/browser/metrics/chrome_stability_metrics_provider.h index 5624182..bb72208 100644 --- a/chrome/browser/metrics/chrome_stability_metrics_provider.h +++ b/chrome/browser/metrics/chrome_stability_metrics_provider.h @@ -31,11 +31,11 @@ class ChromeStabilityMetricsProvider virtual ~ChromeStabilityMetricsProvider(); // metrics::MetricsDataProvider: - virtual void OnRecordingEnabled() OVERRIDE; - virtual void OnRecordingDisabled() OVERRIDE; + virtual void OnRecordingEnabled() override; + virtual void OnRecordingDisabled() override; virtual void ProvideStabilityMetrics( - metrics::SystemProfileProto* system_profile_proto) OVERRIDE; - virtual void ClearSavedStabilityMetrics() OVERRIDE; + metrics::SystemProfileProto* system_profile_proto) override; + virtual void ClearSavedStabilityMetrics() override; // Registers local state prefs used by this class. static void RegisterPrefs(PrefRegistrySimple* registry); @@ -44,11 +44,11 @@ class ChromeStabilityMetricsProvider // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // content::BrowserChildProcessObserver: virtual void BrowserChildProcessCrashed( - const content::ChildProcessData& data) OVERRIDE; + const content::ChildProcessData& data) override; // Logs the initiation of a page load and uses |web_contents| to do // additional logging of the type of page loaded. diff --git a/chrome/browser/metrics/chromeos_metrics_provider.h b/chrome/browser/metrics/chromeos_metrics_provider.h index 39da740..eb45069 100644 --- a/chrome/browser/metrics/chromeos_metrics_provider.h +++ b/chrome/browser/metrics/chromeos_metrics_provider.h @@ -36,13 +36,13 @@ class ChromeOSMetricsProvider : public metrics::MetricsProvider { void InitTaskGetHardwareClass(const base::Closure& callback); // metrics::MetricsProvider: - virtual void OnDidCreateMetricsLog() OVERRIDE; + virtual void OnDidCreateMetricsLog() override; virtual void ProvideSystemProfileMetrics( - metrics::SystemProfileProto* system_profile_proto) OVERRIDE; + metrics::SystemProfileProto* system_profile_proto) override; virtual void ProvideStabilityMetrics( - metrics::SystemProfileProto* system_profile_proto) OVERRIDE; + metrics::SystemProfileProto* system_profile_proto) override; virtual void ProvideGeneralMetrics( - metrics::ChromeUserMetricsExtension* uma_proto) OVERRIDE; + metrics::ChromeUserMetricsExtension* uma_proto) override; private: // Called on the FILE thread to load hardware class information. diff --git a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc index fd5e3a8..5c14470 100644 --- a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc +++ b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc @@ -54,7 +54,7 @@ class ChromeOSMetricsProviderTest : public testing::Test { ChromeOSMetricsProviderTest() {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { #if defined(USE_X11) ui::DeviceDataManagerX11::CreateInstance(); #endif @@ -97,7 +97,7 @@ class ChromeOSMetricsProviderTest : public testing::Test { chromeos::LoginState::Initialize(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Destroy the login state tracker if it was initialized. chromeos::LoginState::Shutdown(); diff --git a/chrome/browser/metrics/extensions_metrics_provider.h b/chrome/browser/metrics/extensions_metrics_provider.h index 2464277..9f89727 100644 --- a/chrome/browser/metrics/extensions_metrics_provider.h +++ b/chrome/browser/metrics/extensions_metrics_provider.h @@ -35,7 +35,7 @@ class ExtensionsMetricsProvider : public metrics::MetricsProvider { // metrics::MetricsProvider: virtual void ProvideSystemProfileMetrics( - metrics::SystemProfileProto* system_profile) OVERRIDE; + metrics::SystemProfileProto* system_profile) override; protected: // Exposed for the sake of mocking in test code. diff --git a/chrome/browser/metrics/extensions_metrics_provider_unittest.cc b/chrome/browser/metrics/extensions_metrics_provider_unittest.cc index d73fccf..556288d 100644 --- a/chrome/browser/metrics/extensions_metrics_provider_unittest.cc +++ b/chrome/browser/metrics/extensions_metrics_provider_unittest.cc @@ -43,7 +43,7 @@ class TestExtensionsMetricsProvider : public ExtensionsMetricsProvider { // Override the GetInstalledExtensions method to return a set of extensions // for tests. virtual scoped_ptr<extensions::ExtensionSet> GetInstalledExtensions( - Profile* profile) OVERRIDE { + Profile* profile) override { scoped_ptr<extensions::ExtensionSet> extensions( new extensions::ExtensionSet()); scoped_refptr<const extensions::Extension> extension; @@ -76,7 +76,7 @@ class TestExtensionsMetricsProvider : public ExtensionsMetricsProvider { // Override GetClientID() to return a specific value on which test // expectations are based. - virtual uint64 GetClientID() OVERRIDE { return 0x3f1bfee9; } + virtual uint64 GetClientID() override { return 0x3f1bfee9; } }; } // namespace diff --git a/chrome/browser/metrics/field_trial_synchronizer.h b/chrome/browser/metrics/field_trial_synchronizer.h index 8feabf7..b9d59b0 100644 --- a/chrome/browser/metrics/field_trial_synchronizer.h +++ b/chrome/browser/metrics/field_trial_synchronizer.h @@ -47,7 +47,7 @@ class FieldTrialSynchronizer // selected state from the browser process into all the renderer processes. virtual void OnFieldTrialGroupFinalized( const std::string& name, - const std::string& group_name) OVERRIDE; + const std::string& group_name) override; private: friend class base::RefCountedThreadSafe<FieldTrialSynchronizer>; diff --git a/chrome/browser/metrics/google_update_metrics_provider_win.h b/chrome/browser/metrics/google_update_metrics_provider_win.h index 073fd8d6..a898851 100644 --- a/chrome/browser/metrics/google_update_metrics_provider_win.h +++ b/chrome/browser/metrics/google_update_metrics_provider_win.h @@ -24,7 +24,7 @@ class GoogleUpdateMetricsProviderWin : public metrics::MetricsProvider { // metrics::MetricsProvider virtual void ProvideSystemProfileMetrics( - metrics::SystemProfileProto* system_profile_proto) OVERRIDE; + metrics::SystemProfileProto* system_profile_proto) override; private: // This is a small helper struct containing the Google Update metrics state. diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc index 65de2bb..be02c98 100644 --- a/chrome/browser/metrics/metrics_service_browsertest.cc +++ b/chrome/browser/metrics/metrics_service_browsertest.cc @@ -29,7 +29,7 @@ class MetricsServiceBrowserTest : public InProcessBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Enable the metrics service for testing (in recording-only mode). command_line->AppendSwitch(switches::kMetricsRecordingOnly); } diff --git a/chrome/browser/metrics/omnibox_metrics_provider.h b/chrome/browser/metrics/omnibox_metrics_provider.h index 47c5dbc..a5c01b9 100644 --- a/chrome/browser/metrics/omnibox_metrics_provider.h +++ b/chrome/browser/metrics/omnibox_metrics_provider.h @@ -22,16 +22,16 @@ class OmniboxMetricsProvider : public metrics::MetricsProvider, virtual ~OmniboxMetricsProvider(); // metrics::MetricsDataProvider: - virtual void OnRecordingEnabled() OVERRIDE; - virtual void OnRecordingDisabled() OVERRIDE; + virtual void OnRecordingEnabled() override; + virtual void OnRecordingDisabled() override; virtual void ProvideGeneralMetrics( - metrics::ChromeUserMetricsExtension* uma_proto) OVERRIDE; + metrics::ChromeUserMetricsExtension* uma_proto) override; private: // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Records the input text, available choices, and selected entry when the // user uses the Omnibox to open a URL. diff --git a/chrome/browser/metrics/perf_provider_chromeos.cc b/chrome/browser/metrics/perf_provider_chromeos.cc index e8c9386..84caf39 100644 --- a/chrome/browser/metrics/perf_provider_chromeos.cc +++ b/chrome/browser/metrics/perf_provider_chromeos.cc @@ -117,7 +117,7 @@ class WindowedIncognitoObserver : public chrome::BrowserListObserver { private: // chrome::BrowserListObserver implementation. - virtual void OnBrowserAdded(Browser* browser) OVERRIDE { + virtual void OnBrowserAdded(Browser* browser) override { if (browser->profile()->IsOffTheRecord()) incognito_launched_ = true; } diff --git a/chrome/browser/metrics/perf_provider_chromeos.h b/chrome/browser/metrics/perf_provider_chromeos.h index 9b380e4..4a7fa16 100644 --- a/chrome/browser/metrics/perf_provider_chromeos.h +++ b/chrome/browser/metrics/perf_provider_chromeos.h @@ -45,7 +45,7 @@ class PerfProvider : public base::NonThreadSafe, // Called when either the login state or the logged in user type changes. // Activates |perf_provider_| to start collecting. - virtual void LoggedInStateChanged() OVERRIDE; + virtual void LoggedInStateChanged() override; private: // Points to a PerfProvider instance that can be turned on or off based on @@ -56,7 +56,7 @@ class PerfProvider : public base::NonThreadSafe, // Called when a suspend finishes. This is either a successful suspend // followed by a resume, or a suspend that was canceled. Inherited from // PowerManagerClient::Observer. - virtual void SuspendDone(const base::TimeDelta& sleep_duration) OVERRIDE; + virtual void SuspendDone(const base::TimeDelta& sleep_duration) override; // Turns on perf collection. Resets the timer that's used to schedule // collections. @@ -66,7 +66,7 @@ class PerfProvider : public base::NonThreadSafe, // Inherited from content::NotificationObserver. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Turns off perf collection. Does not delete any data that was already // collected and stored in |cached_perf_data_|. diff --git a/chrome/browser/metrics/plugin_metrics_provider.h b/chrome/browser/metrics/plugin_metrics_provider.h index 17fff49..acefeb1 100644 --- a/chrome/browser/metrics/plugin_metrics_provider.h +++ b/chrome/browser/metrics/plugin_metrics_provider.h @@ -40,10 +40,10 @@ class PluginMetricsProvider : public metrics::MetricsProvider, // metrics::MetricsDataProvider: virtual void ProvideSystemProfileMetrics( - metrics::SystemProfileProto* system_profile_proto) OVERRIDE; + metrics::SystemProfileProto* system_profile_proto) override; virtual void ProvideStabilityMetrics( - metrics::SystemProfileProto* system_profile_proto) OVERRIDE; - virtual void ClearSavedStabilityMetrics() OVERRIDE; + metrics::SystemProfileProto* system_profile_proto) override; + virtual void ClearSavedStabilityMetrics() override; // Notifies the provider about an error loading the plugin at |plugin_path|. void LogPluginLoadingError(const base::FilePath& plugin_path); @@ -89,11 +89,11 @@ class PluginMetricsProvider : public metrics::MetricsProvider, // content::BrowserChildProcessObserver: virtual void BrowserChildProcessHostConnected( - const content::ChildProcessData& data) OVERRIDE; + const content::ChildProcessData& data) override; virtual void BrowserChildProcessCrashed( - const content::ChildProcessData& data) OVERRIDE; + const content::ChildProcessData& data) override; virtual void BrowserChildProcessInstanceCreated( - const content::ChildProcessData& data) OVERRIDE; + const content::ChildProcessData& data) override; PrefService* local_state_; diff --git a/chrome/browser/metrics/signin_status_metrics_provider.h b/chrome/browser/metrics/signin_status_metrics_provider.h index 28c8207..f4c775e 100644 --- a/chrome/browser/metrics/signin_status_metrics_provider.h +++ b/chrome/browser/metrics/signin_status_metrics_provider.h @@ -67,18 +67,18 @@ class SigninStatusMetricsProvider : public metrics::MetricsProvider, // chrome::BrowserListObserver: // This will never be called on Android. - virtual void OnBrowserAdded(Browser* browser) OVERRIDE; + virtual void OnBrowserAdded(Browser* browser) override; // SigninManagerFactory::Observer: - virtual void SigninManagerCreated(SigninManagerBase* manager) OVERRIDE; - virtual void SigninManagerShutdown(SigninManagerBase* manager) OVERRIDE; + virtual void SigninManagerCreated(SigninManagerBase* manager) override; + virtual void SigninManagerShutdown(SigninManagerBase* manager) override; // SigninManagerBase::Observer: virtual void GoogleSigninSucceeded(const std::string& account_id, const std::string& username, - const std::string& password) OVERRIDE; + const std::string& password) override; virtual void GoogleSignedOut(const std::string& account_id, - const std::string& username) OVERRIDE; + const std::string& username) override; // Obtain sign-in status and add observers. void Initialize(); diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc index 5badf2b..709ad2b 100644 --- a/chrome/browser/metrics/thread_watcher.cc +++ b/chrome/browser/metrics/thread_watcher.cc @@ -932,7 +932,7 @@ class StartupWatchDogThread : public base::Watchdog { // Alarm is called if the time expires after an Arm() without someone calling // Disarm(). When Alarm goes off, in release mode we get the crash dump // without crashing and in debug mode we break into the debugger. - virtual void Alarm() OVERRIDE { + virtual void Alarm() override { #if !defined(NDEBUG) StartupHang(); return; @@ -978,7 +978,7 @@ class ShutdownWatchDogThread : public base::Watchdog { // Alarm is called if the time expires after an Arm() without someone calling // Disarm(). We crash the browser if this method is called. - virtual void Alarm() OVERRIDE { + virtual void Alarm() override { ShutdownHang(); } diff --git a/chrome/browser/metrics/thread_watcher.h b/chrome/browser/metrics/thread_watcher.h index 4cd2f92..d9ef518 100644 --- a/chrome/browser/metrics/thread_watcher.h +++ b/chrome/browser/metrics/thread_watcher.h @@ -529,7 +529,7 @@ class ThreadWatcherObserver : public content::NotificationObserver { // is called. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // The singleton of this class. static ThreadWatcherObserver* g_thread_watcher_observer_; @@ -572,8 +572,8 @@ class WatchDogThread : public base::Thread { base::TimeDelta delay); protected: - virtual void Init() OVERRIDE; - virtual void CleanUp() OVERRIDE; + virtual void Init() override; + virtual void CleanUp() override; private: static bool PostTaskHelper( diff --git a/chrome/browser/metrics/thread_watcher_unittest.cc b/chrome/browser/metrics/thread_watcher_unittest.cc index d51d773..d6c3cef 100644 --- a/chrome/browser/metrics/thread_watcher_unittest.cc +++ b/chrome/browser/metrics/thread_watcher_unittest.cc @@ -118,32 +118,32 @@ class CustomThreadWatcher : public ThreadWatcher { return old_state; } - virtual void ActivateThreadWatching() OVERRIDE { + virtual void ActivateThreadWatching() override { State old_state = UpdateState(ACTIVATED); EXPECT_EQ(old_state, INITIALIZED); ThreadWatcher::ActivateThreadWatching(); } - virtual void DeActivateThreadWatching() OVERRIDE { + virtual void DeActivateThreadWatching() override { State old_state = UpdateState(DEACTIVATED); EXPECT_TRUE(old_state == ACTIVATED || old_state == SENT_PING || old_state == RECEIVED_PONG); ThreadWatcher::DeActivateThreadWatching(); } - virtual void PostPingMessage() OVERRIDE { + virtual void PostPingMessage() override { State old_state = UpdateState(SENT_PING); EXPECT_TRUE(old_state == ACTIVATED || old_state == RECEIVED_PONG); ThreadWatcher::PostPingMessage(); } - virtual void OnPongMessage(uint64 ping_sequence_number) OVERRIDE { + virtual void OnPongMessage(uint64 ping_sequence_number) override { State old_state = UpdateState(RECEIVED_PONG); EXPECT_TRUE(old_state == SENT_PING || old_state == DEACTIVATED); ThreadWatcher::OnPongMessage(ping_sequence_number); } - virtual void OnCheckResponsiveness(uint64 ping_sequence_number) OVERRIDE { + virtual void OnCheckResponsiveness(uint64 ping_sequence_number) override { ThreadWatcher::OnCheckResponsiveness(ping_sequence_number); { base::AutoLock auto_lock(custom_lock_); diff --git a/chrome/browser/metrics/variations/variations_request_scheduler_mobile.h b/chrome/browser/metrics/variations/variations_request_scheduler_mobile.h index c222206..651e984 100644 --- a/chrome/browser/metrics/variations/variations_request_scheduler_mobile.h +++ b/chrome/browser/metrics/variations/variations_request_scheduler_mobile.h @@ -23,9 +23,9 @@ class VariationsRequestSchedulerMobile : public VariationsRequestScheduler { virtual ~VariationsRequestSchedulerMobile(); // Base class overrides. - virtual void Start() OVERRIDE; - virtual void Reset() OVERRIDE; - virtual void OnAppEnterForeground() OVERRIDE; + virtual void Start() override; + virtual void Reset() override; + virtual void OnAppEnterForeground() override; private: FRIEND_TEST_ALL_PREFIXES(VariationsRequestSchedulerMobileTest, diff --git a/chrome/browser/metrics/variations/variations_seed_store_unittest.cc b/chrome/browser/metrics/variations/variations_seed_store_unittest.cc index 6f42c80..d73378c 100644 --- a/chrome/browser/metrics/variations/variations_seed_store_unittest.cc +++ b/chrome/browser/metrics/variations/variations_seed_store_unittest.cc @@ -30,7 +30,7 @@ class TestVariationsSeedStore : public VariationsSeedStore { virtual VariationsSeedStore::VerifySignatureResult VerifySeedSignature( const std::string& seed_bytes, - const std::string& base64_seed_signature) OVERRIDE { + const std::string& base64_seed_signature) override { return VariationsSeedStore::VARIATIONS_SEED_SIGNATURE_ENUM_SIZE; } diff --git a/chrome/browser/metrics/variations/variations_service.h b/chrome/browser/metrics/variations/variations_service.h index 108d621..0293396 100644 --- a/chrome/browser/metrics/variations/variations_service.h +++ b/chrome/browser/metrics/variations/variations_service.h @@ -168,10 +168,10 @@ class VariationsService const variations::VariationsSeedSimulator::Result& result); // net::URLFetcherDelegate implementation: - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; // ResourceRequestAllowedNotifier::Observer implementation: - virtual void OnResourceRequestsAllowed() OVERRIDE; + virtual void OnResourceRequestsAllowed() override; // Performs a variations seed simulation with the given |seed| and |version| // and logs the simulation results as histograms. diff --git a/chrome/browser/metrics/variations/variations_service_unittest.cc b/chrome/browser/metrics/variations/variations_service_unittest.cc index bd5e134..6478ade 100644 --- a/chrome/browser/metrics/variations/variations_service_unittest.cc +++ b/chrome/browser/metrics/variations/variations_service_unittest.cc @@ -58,7 +58,7 @@ class TestVariationsService : public VariationsService { bool seed_stored() const { return seed_stored_; } - virtual void DoActualFetch() OVERRIDE { + virtual void DoActualFetch() override { if (intercepts_fetch_) { fetch_attempted_ = true; return; @@ -70,7 +70,7 @@ class TestVariationsService : public VariationsService { protected: virtual void StoreSeed(const std::string& seed_data, const std::string& seed_signature, - const base::Time& date_fetched) OVERRIDE { + const base::Time& date_fetched) override { seed_stored_ = true; } @@ -91,7 +91,7 @@ class TestVariationsServiceObserver : public VariationsService::Observer { virtual ~TestVariationsServiceObserver() { } - virtual void OnExperimentChangesDetected(Severity severity) OVERRIDE { + virtual void OnExperimentChangesDetected(Severity severity) override { switch (severity) { case BEST_EFFORT: ++best_effort_changes_notified_; @@ -198,7 +198,7 @@ class VariationsServiceTestChromeOS : public VariationsServiceTest { protected: VariationsServiceTestChromeOS() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { cros_settings_ = chromeos::CrosSettings::Get(); DCHECK(cros_settings_ != NULL); // Remove the real DeviceSettingsProvider and replace it with a stub that @@ -211,7 +211,7 @@ class VariationsServiceTestChromeOS : public VariationsServiceTest { cros_settings_->AddSettingsProvider(&stub_settings_provider_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Restore the real DeviceSettingsProvider. EXPECT_TRUE( cros_settings_->RemoveSettingsProvider(&stub_settings_provider_)); diff --git a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h index d864972..96be8c5 100644 --- a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h +++ b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h @@ -18,16 +18,16 @@ class ChromeMetroViewerProcessHost : public win8::MetroViewerProcessHost { private: // win8::MetroViewerProcessHost implementation - virtual void OnChannelError() OVERRIDE; + virtual void OnChannelError() override; // IPC::Listener implementation - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; + virtual void OnChannelConnected(int32 peer_pid) override; virtual void OnSetTargetSurface(gfx::NativeViewId target_surface, - float device_scale) OVERRIDE; - virtual void OnOpenURL(const base::string16& url) OVERRIDE; + float device_scale) override; + virtual void OnOpenURL(const base::string16& url) override; virtual void OnHandleSearchRequest( - const base::string16& search_string) OVERRIDE; - virtual void OnWindowSizeChanged(uint32 width, uint32 height) OVERRIDE; + const base::string16& search_string) override; + virtual void OnWindowSizeChanged(uint32 width, uint32 height) override; DISALLOW_COPY_AND_ASSIGN(ChromeMetroViewerProcessHost); }; diff --git a/chrome/browser/nacl_host/nacl_browser_delegate_impl.h b/chrome/browser/nacl_host/nacl_browser_delegate_impl.h index e9b8f95..1229b59 100644 --- a/chrome/browser/nacl_host/nacl_browser_delegate_impl.h +++ b/chrome/browser/nacl_host/nacl_browser_delegate_impl.h @@ -24,25 +24,25 @@ class NaClBrowserDelegateImpl : public NaClBrowserDelegate { virtual ~NaClBrowserDelegateImpl(); virtual void ShowMissingArchInfobar(int render_process_id, - int render_view_id) OVERRIDE; - virtual bool DialogsAreSuppressed() OVERRIDE; - virtual bool GetCacheDirectory(base::FilePath* cache_dir) OVERRIDE; - virtual bool GetPluginDirectory(base::FilePath* plugin_dir) OVERRIDE; - virtual bool GetPnaclDirectory(base::FilePath* pnacl_dir) OVERRIDE; - virtual bool GetUserDirectory(base::FilePath* user_dir) OVERRIDE; - virtual std::string GetVersionString() const OVERRIDE; + int render_view_id) override; + virtual bool DialogsAreSuppressed() override; + virtual bool GetCacheDirectory(base::FilePath* cache_dir) override; + virtual bool GetPluginDirectory(base::FilePath* plugin_dir) override; + virtual bool GetPnaclDirectory(base::FilePath* pnacl_dir) override; + virtual bool GetUserDirectory(base::FilePath* user_dir) override; + virtual std::string GetVersionString() const override; virtual ppapi::host::HostFactory* CreatePpapiHostFactory( - content::BrowserPpapiHost* ppapi_host) OVERRIDE; + content::BrowserPpapiHost* ppapi_host) override; virtual bool MapUrlToLocalFilePath(const GURL& url, bool is_blocking, const base::FilePath& profile_directory, - base::FilePath* file_path) OVERRIDE; - virtual void SetDebugPatterns(std::string debug_patterns) OVERRIDE; - virtual bool URLMatchesDebugPatterns(const GURL& manifest_url) OVERRIDE; + base::FilePath* file_path) override; + virtual void SetDebugPatterns(std::string debug_patterns) override; + virtual bool URLMatchesDebugPatterns(const GURL& manifest_url) override; virtual content::BrowserPpapiHost::OnKeepaliveCallback - GetOnKeepaliveCallback() OVERRIDE; + GetOnKeepaliveCallback() override; virtual bool IsNonSfiModeAllowed(const base::FilePath& profile_directory, - const GURL& manifest_url) OVERRIDE; + const GURL& manifest_url) override; private: #if defined(ENABLE_EXTENSIONS) diff --git a/chrome/browser/nacl_host/nacl_infobar_delegate.h b/chrome/browser/nacl_host/nacl_infobar_delegate.h index 543d87a..54efbf5 100644 --- a/chrome/browser/nacl_host/nacl_infobar_delegate.h +++ b/chrome/browser/nacl_host/nacl_infobar_delegate.h @@ -17,10 +17,10 @@ class NaClInfoBarDelegate : public ConfirmInfoBarDelegate { NaClInfoBarDelegate(); virtual ~NaClInfoBarDelegate(); - virtual base::string16 GetMessageText() const OVERRIDE; - virtual int GetButtons() const OVERRIDE; - virtual base::string16 GetLinkText() const OVERRIDE; - virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE; + virtual base::string16 GetMessageText() const override; + virtual int GetButtons() const override; + virtual base::string16 GetLinkText() const override; + virtual bool LinkClicked(WindowOpenDisposition disposition) override; DISALLOW_COPY_AND_ASSIGN(NaClInfoBarDelegate); }; diff --git a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc index ac26321..fc1c80e 100644 --- a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc +++ b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc @@ -19,7 +19,7 @@ class NaClGdbDebugStubTest : public PPAPINaClNewlibTest { NaClGdbDebugStubTest() { } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; + virtual void SetUpCommandLine(CommandLine* command_line) override; void StartTestScript(base::ProcessHandle* test_process, std::string test_name, int debug_stub_port); diff --git a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc index fb4902b..eb60432 100644 --- a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc +++ b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc @@ -23,7 +23,7 @@ class NaClGdbTest : public PPAPINaClNewlibTest { NaClGdbTest() { } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { PPAPINaClNewlibTest::SetUpCommandLine(command_line); base::FilePath mock_nacl_gdb; diff --git a/chrome/browser/net/about_protocol_handler.h b/chrome/browser/net/about_protocol_handler.h index 623b1b0..7a3b449d 100644 --- a/chrome/browser/net/about_protocol_handler.h +++ b/chrome/browser/net/about_protocol_handler.h @@ -17,8 +17,8 @@ class AboutProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler { AboutProtocolHandler(); virtual net::URLRequestJob* MaybeCreateJob( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE; - virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE; + net::NetworkDelegate* network_delegate) const override; + virtual bool IsSafeRedirectTarget(const GURL& location) const override; private: DISALLOW_COPY_AND_ASSIGN(AboutProtocolHandler); diff --git a/chrome/browser/net/chrome_extensions_network_delegate.cc b/chrome/browser/net/chrome_extensions_network_delegate.cc index 3a0a123e..118631d 100644 --- a/chrome/browser/net/chrome_extensions_network_delegate.cc +++ b/chrome/browser/net/chrome_extensions_network_delegate.cc @@ -87,35 +87,35 @@ class ChromeExtensionsNetworkDelegateImpl private: // ChromeExtensionsNetworkDelegate implementation. - virtual void ForwardProxyErrors(net::URLRequest* request) OVERRIDE; - virtual void ForwardStartRequestStatus(net::URLRequest* request) OVERRIDE; - virtual void ForwardDoneRequestStatus(net::URLRequest* request) OVERRIDE; + virtual void ForwardProxyErrors(net::URLRequest* request) override; + virtual void ForwardStartRequestStatus(net::URLRequest* request) override; + virtual void ForwardDoneRequestStatus(net::URLRequest* request) override; virtual int OnBeforeURLRequest(net::URLRequest* request, const net::CompletionCallback& callback, - GURL* new_url) OVERRIDE; + GURL* new_url) override; virtual int OnBeforeSendHeaders(net::URLRequest* request, const net::CompletionCallback& callback, - net::HttpRequestHeaders* headers) OVERRIDE; + net::HttpRequestHeaders* headers) override; virtual void OnSendHeaders(net::URLRequest* request, - const net::HttpRequestHeaders& headers) OVERRIDE; + const net::HttpRequestHeaders& headers) override; virtual int OnHeadersReceived( net::URLRequest* request, const net::CompletionCallback& callback, const net::HttpResponseHeaders* original_response_headers, scoped_refptr<net::HttpResponseHeaders>* override_response_headers, - GURL* allowed_unsafe_redirect_url) OVERRIDE; + GURL* allowed_unsafe_redirect_url) override; virtual void OnBeforeRedirect(net::URLRequest* request, - const GURL& new_location) OVERRIDE; - virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE; - virtual void OnCompleted(net::URLRequest* request, bool started) OVERRIDE; - virtual void OnURLRequestDestroyed(net::URLRequest* request) OVERRIDE; + const GURL& new_location) override; + virtual void OnResponseStarted(net::URLRequest* request) override; + virtual void OnCompleted(net::URLRequest* request, bool started) override; + virtual void OnURLRequestDestroyed(net::URLRequest* request) override; virtual void OnPACScriptError(int line_number, - const base::string16& error) OVERRIDE; + const base::string16& error) override; virtual net::NetworkDelegate::AuthRequiredResponse OnAuthRequired( net::URLRequest* request, const net::AuthChallengeInfo& auth_info, const AuthCallback& callback, - net::AuthCredentials* credentials) OVERRIDE; + net::AuthCredentials* credentials) override; scoped_refptr<extensions::EventRouterForwarder> event_router_; diff --git a/chrome/browser/net/chrome_extensions_network_delegate.h b/chrome/browser/net/chrome_extensions_network_delegate.h index 8f31874..7650cd9 100644 --- a/chrome/browser/net/chrome_extensions_network_delegate.h +++ b/chrome/browser/net/chrome_extensions_network_delegate.h @@ -46,30 +46,30 @@ class ChromeExtensionsNetworkDelegate : public net::NetworkDelegate { // NetworkDelegate implementation. virtual int OnBeforeURLRequest(net::URLRequest* request, const net::CompletionCallback& callback, - GURL* new_url) OVERRIDE; + GURL* new_url) override; virtual int OnBeforeSendHeaders(net::URLRequest* request, const net::CompletionCallback& callback, - net::HttpRequestHeaders* headers) OVERRIDE; + net::HttpRequestHeaders* headers) override; virtual void OnSendHeaders(net::URLRequest* request, - const net::HttpRequestHeaders& headers) OVERRIDE; + const net::HttpRequestHeaders& headers) override; virtual int OnHeadersReceived( net::URLRequest* request, const net::CompletionCallback& callback, const net::HttpResponseHeaders* original_response_headers, scoped_refptr<net::HttpResponseHeaders>* override_response_headers, - GURL* allowed_unsafe_redirect_url) OVERRIDE; + GURL* allowed_unsafe_redirect_url) override; virtual void OnBeforeRedirect(net::URLRequest* request, - const GURL& new_location) OVERRIDE; - virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE; - virtual void OnCompleted(net::URLRequest* request, bool started) OVERRIDE; - virtual void OnURLRequestDestroyed(net::URLRequest* request) OVERRIDE; + const GURL& new_location) override; + virtual void OnResponseStarted(net::URLRequest* request) override; + virtual void OnCompleted(net::URLRequest* request, bool started) override; + virtual void OnURLRequestDestroyed(net::URLRequest* request) override; virtual void OnPACScriptError(int line_number, - const base::string16& error) OVERRIDE; + const base::string16& error) override; virtual net::NetworkDelegate::AuthRequiredResponse OnAuthRequired( net::URLRequest* request, const net::AuthChallengeInfo& auth_info, const AuthCallback& callback, - net::AuthCredentials* credentials) OVERRIDE; + net::AuthCredentials* credentials) override; protected: ChromeExtensionsNetworkDelegate(); diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter.h b/chrome/browser/net/chrome_fraudulent_certificate_reporter.h index daec4c1..24ee4057 100644 --- a/chrome/browser/net/chrome_fraudulent_certificate_reporter.h +++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter.h @@ -33,12 +33,12 @@ class ChromeFraudulentCertificateReporter // net::FraudulentCertificateReporter virtual void SendReport(const std::string& hostname, - const net::SSLInfo& ssl_info) OVERRIDE; + const net::SSLInfo& ssl_info) override; // net::URLRequest::Delegate - virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE; + virtual void OnResponseStarted(net::URLRequest* request) override; virtual void OnReadCompleted(net::URLRequest* request, - int bytes_read) OVERRIDE; + int bytes_read) override; protected: net::URLRequestContext* const request_context_; diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc index ca5464d..11b613f 100644 --- a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc +++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc @@ -83,7 +83,7 @@ class SendingTestReporter : public TestReporter { // Passes if invoked with a good SSLInfo and for a hostname that is a Google // pinned property. virtual void SendReport(const std::string& hostname, - const SSLInfo& ssl_info) OVERRIDE { + const SSLInfo& ssl_info) override { EXPECT_TRUE(IsGoodSSLInfo(ssl_info)); EXPECT_TRUE(net::TransportSecurityState::IsGooglePinnedProperty(hostname)); passed_ = true; @@ -106,7 +106,7 @@ class NotSendingTestReporter : public TestReporter { // Passes if invoked with a bad SSLInfo and for a hostname that is not a // Google pinned property. virtual void SendReport(const std::string& hostname, - const SSLInfo& ssl_info) OVERRIDE { + const SSLInfo& ssl_info) override { EXPECT_FALSE(IsGoodSSLInfo(ssl_info)); EXPECT_FALSE(net::TransportSecurityState::IsGooglePinnedProperty(hostname)); } @@ -120,7 +120,7 @@ class MockReporter : public ChromeFraudulentCertificateReporter { : ChromeFraudulentCertificateReporter(request_context) {} virtual scoped_ptr<net::URLRequest> CreateURLRequest( - net::URLRequestContext* context) OVERRIDE { + net::URLRequestContext* context) override { return context->CreateRequest(GURL(std::string()), net::DEFAULT_PRIORITY, NULL, @@ -129,7 +129,7 @@ class MockReporter : public ChromeFraudulentCertificateReporter { virtual void SendReport( const std::string& hostname, - const net::SSLInfo& ssl_info) OVERRIDE { + const net::SSLInfo& ssl_info) override { DCHECK(!hostname.empty()); DCHECK(ssl_info.is_valid()); ChromeFraudulentCertificateReporter::SendReport(hostname, ssl_info); diff --git a/chrome/browser/net/chrome_http_user_agent_settings.h b/chrome/browser/net/chrome_http_user_agent_settings.h index 78f70cb..feb0900 100644 --- a/chrome/browser/net/chrome_http_user_agent_settings.h +++ b/chrome/browser/net/chrome_http_user_agent_settings.h @@ -26,8 +26,8 @@ class ChromeHttpUserAgentSettings : public net::HttpUserAgentSettings { void CleanupOnUIThread(); // net::HttpUserAgentSettings implementation - virtual std::string GetAcceptLanguage() const OVERRIDE; - virtual std::string GetUserAgent() const OVERRIDE; + virtual std::string GetAcceptLanguage() const override; + virtual std::string GetUserAgent() const override; private: StringPrefMember pref_accept_language_; diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h index 4161e79..aae343c 100644 --- a/chrome/browser/net/chrome_network_delegate.h +++ b/chrome/browser/net/chrome_network_delegate.h @@ -218,62 +218,62 @@ class ChromeNetworkDelegate : public net::NetworkDelegate { // NetworkDelegate implementation. virtual int OnBeforeURLRequest(net::URLRequest* request, const net::CompletionCallback& callback, - GURL* new_url) OVERRIDE; + GURL* new_url) override; virtual void OnResolveProxy( const GURL& url, int load_flags, const net::ProxyService& proxy_service, - net::ProxyInfo* result) OVERRIDE; + net::ProxyInfo* result) override; virtual void OnProxyFallback(const net::ProxyServer& bad_proxy, - int net_error) OVERRIDE; + int net_error) override; virtual int OnBeforeSendHeaders(net::URLRequest* request, const net::CompletionCallback& callback, - net::HttpRequestHeaders* headers) OVERRIDE; + net::HttpRequestHeaders* headers) override; virtual void OnBeforeSendProxyHeaders( net::URLRequest* request, const net::ProxyInfo& proxy_info, - net::HttpRequestHeaders* headers) OVERRIDE; + net::HttpRequestHeaders* headers) override; virtual void OnSendHeaders(net::URLRequest* request, - const net::HttpRequestHeaders& headers) OVERRIDE; + const net::HttpRequestHeaders& headers) override; virtual int OnHeadersReceived( net::URLRequest* request, const net::CompletionCallback& callback, const net::HttpResponseHeaders* original_response_headers, scoped_refptr<net::HttpResponseHeaders>* override_response_headers, - GURL* allowed_unsafe_redirect_url) OVERRIDE; + GURL* allowed_unsafe_redirect_url) override; virtual void OnBeforeRedirect(net::URLRequest* request, - const GURL& new_location) OVERRIDE; - virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE; + const GURL& new_location) override; + virtual void OnResponseStarted(net::URLRequest* request) override; virtual void OnRawBytesRead(const net::URLRequest& request, - int bytes_read) OVERRIDE; - virtual void OnCompleted(net::URLRequest* request, bool started) OVERRIDE; - virtual void OnURLRequestDestroyed(net::URLRequest* request) OVERRIDE; + int bytes_read) override; + virtual void OnCompleted(net::URLRequest* request, bool started) override; + virtual void OnURLRequestDestroyed(net::URLRequest* request) override; virtual void OnPACScriptError(int line_number, - const base::string16& error) OVERRIDE; + const base::string16& error) override; virtual net::NetworkDelegate::AuthRequiredResponse OnAuthRequired( net::URLRequest* request, const net::AuthChallengeInfo& auth_info, const AuthCallback& callback, - net::AuthCredentials* credentials) OVERRIDE; + net::AuthCredentials* credentials) override; virtual bool OnCanGetCookies(const net::URLRequest& request, - const net::CookieList& cookie_list) OVERRIDE; + const net::CookieList& cookie_list) override; virtual bool OnCanSetCookie(const net::URLRequest& request, const std::string& cookie_line, - net::CookieOptions* options) OVERRIDE; + net::CookieOptions* options) override; virtual bool OnCanAccessFile(const net::URLRequest& request, - const base::FilePath& path) const OVERRIDE; + const base::FilePath& path) const override; virtual bool OnCanThrottleRequest( - const net::URLRequest& request) const OVERRIDE; + const net::URLRequest& request) const override; virtual bool OnCanEnablePrivacyMode( const GURL& url, - const GURL& first_party_for_cookies) const OVERRIDE; + const GURL& first_party_for_cookies) const override; virtual int OnBeforeSocketStreamConnect( net::SocketStream* stream, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual bool OnCancelURLRequestWithPolicyViolatingReferrerHeader( const net::URLRequest& request, const GURL& target_url, - const GURL& referrer_url) const OVERRIDE; + const GURL& referrer_url) const override; void AccumulateContentLength( int64 received_payload_byte_count, diff --git a/chrome/browser/net/chrome_network_delegate_unittest.cc b/chrome/browser/net/chrome_network_delegate_unittest.cc index bfec361..1f9d811 100644 --- a/chrome/browser/net/chrome_network_delegate_unittest.cc +++ b/chrome/browser/net/chrome_network_delegate_unittest.cc @@ -31,13 +31,13 @@ class ChromeNetworkDelegateTest : public testing::Test { : forwarder_(new extensions::EventRouterForwarder()) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { never_throttle_requests_original_value_ = ChromeNetworkDelegate::g_never_throttle_requests_; ChromeNetworkDelegate::g_never_throttle_requests_ = false; } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { ChromeNetworkDelegate::g_never_throttle_requests_ = never_throttle_requests_original_value_; } @@ -103,7 +103,7 @@ class ChromeNetworkDelegateSafeSearchTest : public testing::Test { #endif } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeNetworkDelegate::InitializePrefsOnUIThread( &enable_referrers_, NULL, &force_google_safe_search_, profile_.GetTestingPrefService()); @@ -312,7 +312,7 @@ class ChromeNetworkDelegatePrivacyModeTest : public testing::Test { kFirstPartySite("http://cool.things.com"), kBlockedFirstPartySite("http://no.thirdparties.com") {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeNetworkDelegate::InitializePrefsOnUIThread( &enable_referrers_, NULL, NULL, profile_.GetTestingPrefService()); diff --git a/chrome/browser/net/chrome_url_request_context_getter.cc b/chrome/browser/net/chrome_url_request_context_getter.cc index deac9be..b8f7083 100644 --- a/chrome/browser/net/chrome_url_request_context_getter.cc +++ b/chrome/browser/net/chrome_url_request_context_getter.cc @@ -48,7 +48,7 @@ class FactoryForMain : public ChromeURLRequestContextFactory { std::swap(protocol_handlers_, *protocol_handlers); } - virtual net::URLRequestContext* Create() OVERRIDE { + virtual net::URLRequestContext* Create() override { profile_io_data_->Init(&protocol_handlers_, request_interceptors_.Pass()); return profile_io_data_->GetMainRequestContext(); } @@ -65,7 +65,7 @@ class FactoryForExtensions : public ChromeURLRequestContextFactory { explicit FactoryForExtensions(const ProfileIOData* profile_io_data) : profile_io_data_(profile_io_data) {} - virtual net::URLRequestContext* Create() OVERRIDE { + virtual net::URLRequestContext* Create() override { return profile_io_data_->GetExtensionsRequestContext(); } @@ -92,7 +92,7 @@ class FactoryForIsolatedApp : public ChromeURLRequestContextFactory { std::swap(protocol_handlers_, *protocol_handlers); } - virtual net::URLRequestContext* Create() OVERRIDE { + virtual net::URLRequestContext* Create() override { // We will copy most of the state from the main request context. // // Note that this factory is one-shot. After Create() is called once, the @@ -129,7 +129,7 @@ class FactoryForIsolatedMedia : public ChromeURLRequestContextFactory { partition_descriptor_(partition_descriptor), app_context_getter_(app_context) {} - virtual net::URLRequestContext* Create() OVERRIDE { + virtual net::URLRequestContext* Create() override { // We will copy most of the state from the corresopnding app's // request context. We expect to have the same lifetime as // the associated |app_context_getter_| so we can just reuse @@ -153,7 +153,7 @@ class FactoryForMedia : public ChromeURLRequestContextFactory { : profile_io_data_(profile_io_data) { } - virtual net::URLRequestContext* Create() OVERRIDE { + virtual net::URLRequestContext* Create() override { return profile_io_data_->GetMediaRequestContext(); } diff --git a/chrome/browser/net/chrome_url_request_context_getter.h b/chrome/browser/net/chrome_url_request_context_getter.h index 36f85a0..7b56c34 100644 --- a/chrome/browser/net/chrome_url_request_context_getter.h +++ b/chrome/browser/net/chrome_url_request_context_getter.h @@ -37,9 +37,9 @@ class ChromeURLRequestContextGetter : public net::URLRequestContextGetter { // GetIOMessageLoopProxy however can be called from any thread. // // net::URLRequestContextGetter implementation. - virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE; + virtual net::URLRequestContext* GetURLRequestContext() override; virtual scoped_refptr<base::SingleThreadTaskRunner> - GetNetworkTaskRunner() const OVERRIDE; + GetNetworkTaskRunner() const override; // Create an instance for use with an 'original' (non-OTR) profile. This is // expected to get called on the UI thread. diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc index f93e863..703eefa 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/chrome/browser/net/connection_tester.cc @@ -318,9 +318,9 @@ class ConnectionTester::TestRunner : public net::URLRequest::Delegate { void Run(const Experiment& experiment); // Overridden from net::URLRequest::Delegate: - virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE; + virtual void OnResponseStarted(net::URLRequest* request) override; virtual void OnReadCompleted(net::URLRequest* request, - int bytes_read) OVERRIDE; + int bytes_read) override; // TODO(eroman): handle cases requiring authentication. private: diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc index eaf84bc..4c4836b 100644 --- a/chrome/browser/net/connection_tester_unittest.cc +++ b/chrome/browser/net/connection_tester_unittest.cc @@ -40,22 +40,22 @@ class ConnectionTesterDelegate : public ConnectionTester::Delegate { completed_connection_test_suite_count_(0) { } - virtual void OnStartConnectionTestSuite() OVERRIDE { + virtual void OnStartConnectionTestSuite() override { start_connection_test_suite_count_++; } virtual void OnStartConnectionTestExperiment( - const ConnectionTester::Experiment& experiment) OVERRIDE { + const ConnectionTester::Experiment& experiment) override { start_connection_test_experiment_count_++; } virtual void OnCompletedConnectionTestExperiment( const ConnectionTester::Experiment& experiment, - int result) OVERRIDE { + int result) override { completed_connection_test_experiment_count_++; } - virtual void OnCompletedConnectionTestSuite() OVERRIDE { + virtual void OnCompletedConnectionTestSuite() override { completed_connection_test_suite_count_++; base::MessageLoop::current()->Quit(); } diff --git a/chrome/browser/net/cookie_store_util.cc b/chrome/browser/net/cookie_store_util.cc index 5e5d780..10cd52c 100644 --- a/chrome/browser/net/cookie_store_util.cc +++ b/chrome/browser/net/cookie_store_util.cc @@ -44,14 +44,14 @@ class ChromeCookieMonsterDelegate : public net::CookieMonsterDelegate { virtual void OnCookieChanged( const net::CanonicalCookie& cookie, bool removed, - net::CookieMonster::Delegate::ChangeCause cause) OVERRIDE { + net::CookieMonster::Delegate::ChangeCause cause) override { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, base::Bind(&ChromeCookieMonsterDelegate::OnCookieChangedAsyncHelper, this, cookie, removed, cause)); } - virtual void OnLoaded() OVERRIDE { + virtual void OnLoaded() override { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, base::Bind(&ChromeCookieMonsterDelegate::OnLoadedAsyncHelper, @@ -130,9 +130,9 @@ namespace { class CookieOSCryptoDelegate : public content::CookieCryptoDelegate { public: virtual bool EncryptString(const std::string& plaintext, - std::string* ciphertext) OVERRIDE; + std::string* ciphertext) override; virtual bool DecryptString(const std::string& ciphertext, - std::string* plaintext) OVERRIDE; + std::string* plaintext) override; }; bool CookieOSCryptoDelegate::EncryptString(const std::string& plaintext, diff --git a/chrome/browser/net/crl_set_fetcher.h b/chrome/browser/net/crl_set_fetcher.h index b5a3912..a938c11 100644 --- a/chrome/browser/net/crl_set_fetcher.h +++ b/chrome/browser/net/crl_set_fetcher.h @@ -33,11 +33,11 @@ class CRLSetFetcher : public component_updater::ComponentInstaller, void DeleteFromDisk(const base::FilePath& path); // ComponentInstaller interface - virtual void OnUpdateError(int error) OVERRIDE; + virtual void OnUpdateError(int error) override; virtual bool Install(const base::DictionaryValue& manifest, - const base::FilePath& unpack_path) OVERRIDE; + const base::FilePath& unpack_path) override; virtual bool GetInstalledFile(const std::string& file, - base::FilePath* installed_file) OVERRIDE; + base::FilePath* installed_file) override; private: friend class base::RefCountedThreadSafe<CRLSetFetcher>; diff --git a/chrome/browser/net/disk_cache_dir_policy_handler.h b/chrome/browser/net/disk_cache_dir_policy_handler.h index d553aac..40a5fd2 100644 --- a/chrome/browser/net/disk_cache_dir_policy_handler.h +++ b/chrome/browser/net/disk_cache_dir_policy_handler.h @@ -19,7 +19,7 @@ class DiskCacheDirPolicyHandler : public TypeCheckingPolicyHandler { // ConfigurationPolicyHandler methods: virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: DISALLOW_COPY_AND_ASSIGN(DiskCacheDirPolicyHandler); diff --git a/chrome/browser/net/dns_probe_browsertest.cc b/chrome/browser/net/dns_probe_browsertest.cc index a3c71b2..d536aae 100644 --- a/chrome/browser/net/dns_probe_browsertest.cc +++ b/chrome/browser/net/dns_probe_browsertest.cc @@ -82,7 +82,7 @@ class DelayingDnsProbeService : public DnsProbeService { EXPECT_TRUE(delayed_probes_.empty()); } - virtual void ProbeDns(const ProbeCallback& callback) OVERRIDE { + virtual void ProbeDns(const ProbeCallback& callback) override { delayed_probes_.push_back(callback); } @@ -143,7 +143,7 @@ class DelayableURLRequestFailedJob : public URLRequestFailedJob, start_delayed_(false), destruction_callback_(destruction_callback) {} - virtual void Start() OVERRIDE { + virtual void Start() override { if (should_delay_) { DCHECK(!start_delayed_); start_delayed_ = true; @@ -152,7 +152,7 @@ class DelayableURLRequestFailedJob : public URLRequestFailedJob, URLRequestFailedJob::Start(); } - virtual void Resume() OVERRIDE { + virtual void Resume() override { DCHECK(should_delay_); should_delay_ = false; if (start_delayed_) { @@ -191,7 +191,7 @@ class DelayableURLRequestMockHTTPJob : public URLRequestMockHTTPJob, start_delayed_(false), destruction_callback_(destruction_callback) {} - virtual void Start() OVERRIDE { + virtual void Start() override { if (should_delay_) { DCHECK(!start_delayed_); start_delayed_ = true; @@ -200,7 +200,7 @@ class DelayableURLRequestMockHTTPJob : public URLRequestMockHTTPJob, URLRequestMockHTTPJob::Start(); } - virtual void Resume() OVERRIDE { + virtual void Resume() override { DCHECK(should_delay_); should_delay_ = false; if (start_delayed_) { @@ -242,7 +242,7 @@ class BreakableCorrectionInterceptor : public URLRequestInterceptor { virtual URLRequestJob* MaybeInterceptRequest( URLRequest* request, - NetworkDelegate* network_delegate) const OVERRIDE { + NetworkDelegate* network_delegate) const override { if (net_error_ != net::OK) { DelayableURLRequestFailedJob* job = new DelayableURLRequestFailedJob( @@ -433,8 +433,8 @@ class DnsProbeBrowserTest : public InProcessBrowserTest { DnsProbeBrowserTest(); virtual ~DnsProbeBrowserTest(); - virtual void SetUpOnMainThread() OVERRIDE; - virtual void TearDownOnMainThread() OVERRIDE; + virtual void SetUpOnMainThread() override; + virtual void TearDownOnMainThread() override; protected: // Sets the browser object that other methods apply to, and that has the diff --git a/chrome/browser/net/dns_probe_service.h b/chrome/browser/net/dns_probe_service.h index d1df98e..d2d9a29 100644 --- a/chrome/browser/net/dns_probe_service.h +++ b/chrome/browser/net/dns_probe_service.h @@ -38,7 +38,7 @@ class DnsProbeService : public net::NetworkChangeNotifier::DNSObserver { virtual void ProbeDns(const ProbeCallback& callback); // NetworkChangeNotifier::DNSObserver implementation: - virtual void OnDNSChanged() OVERRIDE; + virtual void OnDNSChanged() override; void SetSystemClientForTesting(scoped_ptr<net::DnsClient> system_client); void SetPublicClientForTesting(scoped_ptr<net::DnsClient> public_client); diff --git a/chrome/browser/net/evicted_domain_cookie_counter.cc b/chrome/browser/net/evicted_domain_cookie_counter.cc index abf44af..ebfc6a48 100644 --- a/chrome/browser/net/evicted_domain_cookie_counter.cc +++ b/chrome/browser/net/evicted_domain_cookie_counter.cc @@ -30,8 +30,8 @@ class DelegateImpl : public EvictedDomainCookieCounter::Delegate { // EvictedDomainCookieCounter::Delegate implementation. virtual void Report( const EvictedDomainCookieCounter::EvictedCookie& evicted_cookie, - const Time& reinstatement_time) OVERRIDE; - virtual Time CurrentTime() const OVERRIDE; + const Time& reinstatement_time) override; + virtual Time CurrentTime() const override; }; DelegateImpl::DelegateImpl() {} diff --git a/chrome/browser/net/evicted_domain_cookie_counter.h b/chrome/browser/net/evicted_domain_cookie_counter.h index 5731fa9..fb9c52c 100644 --- a/chrome/browser/net/evicted_domain_cookie_counter.h +++ b/chrome/browser/net/evicted_domain_cookie_counter.h @@ -89,8 +89,8 @@ class EvictedDomainCookieCounter : public net::CookieMonster::Delegate { // CookieMonster::Delegate implementation. virtual void OnCookieChanged(const net::CanonicalCookie& cookie, bool removed, - ChangeCause cause) OVERRIDE; - virtual void OnLoaded() OVERRIDE; + ChangeCause cause) override; + virtual void OnLoaded() override; private: // Identifier of an evicted cookie. diff --git a/chrome/browser/net/evicted_domain_cookie_counter_unittest.cc b/chrome/browser/net/evicted_domain_cookie_counter_unittest.cc index 1a73589..bdab14d 100644 --- a/chrome/browser/net/evicted_domain_cookie_counter_unittest.cc +++ b/chrome/browser/net/evicted_domain_cookie_counter_unittest.cc @@ -37,8 +37,8 @@ class EvictedDomainCookieCounterTest : public testing::Test { // EvictedDomainCookieCounter::Delegate implementation. virtual void Report( const EvictedDomainCookieCounter::EvictedCookie& evicted_cookie, - const Time& reinstatement_time) OVERRIDE; - virtual Time CurrentTime() const OVERRIDE; + const Time& reinstatement_time) override; + virtual Time CurrentTime() const override; private: EvictedDomainCookieCounterTest* tester_; @@ -48,8 +48,8 @@ class EvictedDomainCookieCounterTest : public testing::Test { virtual ~EvictedDomainCookieCounterTest(); // testing::Test implementation. - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; // Initialization that allows parameters to be specified. void InitCounter(size_t max_size, size_t purge_count); @@ -189,11 +189,11 @@ TEST_F(EvictedDomainCookieCounterTest, TestChain) { virtual void OnCookieChanged(const net::CanonicalCookie& cookie, bool removed, - ChangeCause cause) OVERRIDE { + ChangeCause cause) override { ++(*result_); } - virtual void OnLoaded() OVERRIDE {} + virtual void OnLoaded() override {} private: virtual ~ChangedDelegateDummy() {} diff --git a/chrome/browser/net/load_timing_browsertest.cc b/chrome/browser/net/load_timing_browsertest.cc index c5962601..dea5da6 100644 --- a/chrome/browser/net/load_timing_browsertest.cc +++ b/chrome/browser/net/load_timing_browsertest.cc @@ -129,7 +129,7 @@ class MockUrlRequestJobWithTiming : public net::URLRequestFileJob { weak_factory_(this) {} // net::URLRequestFileJob implementation: - virtual void Start() OVERRIDE { + virtual void Start() override { base::TimeDelta time_to_wait; start_time_ = base::TimeTicks::Now(); if (!load_timing_deltas_.receive_headers_end.is_null()) { @@ -147,7 +147,7 @@ class MockUrlRequestJobWithTiming : public net::URLRequestFileJob { } virtual void GetLoadTimingInfo( - net::LoadTimingInfo* load_timing_info) const OVERRIDE { + net::LoadTimingInfo* load_timing_info) const override { // Make sure enough time has elapsed since start was called. If this // fails, the test fixture itself is flaky. if (!load_timing_deltas_.receive_headers_end.is_null()) { @@ -247,7 +247,7 @@ class TestInterceptor : public net::URLRequestInterceptor { // net::URLRequestJobFactory::ProtocolHandler implementation: virtual net::URLRequestJob* MaybeInterceptRequest( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO)); return new MockUrlRequestJobWithTiming(request, network_delegate, path_, diff --git a/chrome/browser/net/net_error_tab_helper.h b/chrome/browser/net/net_error_tab_helper.h index 89c623a..7974906 100644 --- a/chrome/browser/net/net_error_tab_helper.h +++ b/chrome/browser/net/net_error_tab_helper.h @@ -48,24 +48,24 @@ class NetErrorTabHelper // content::WebContentsObserver implementation. virtual void DidStartNavigationToPendingEntry( const GURL& url, - content::NavigationController::ReloadType reload_type) OVERRIDE; + content::NavigationController::ReloadType reload_type) 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; protected: // |contents| is the WebContents of the tab this NetErrorTabHelper is diff --git a/chrome/browser/net/net_error_tab_helper_unittest.cc b/chrome/browser/net/net_error_tab_helper_unittest.cc index 7dea643..e1c3bb6 100644 --- a/chrome/browser/net/net_error_tab_helper_unittest.cc +++ b/chrome/browser/net/net_error_tab_helper_unittest.cc @@ -33,12 +33,12 @@ class TestNetErrorTabHelper : public NetErrorTabHelper { int mock_sent_count() const { return mock_sent_count_; } private: - virtual void StartDnsProbe() OVERRIDE { + virtual void StartDnsProbe() override { EXPECT_FALSE(mock_probe_running_); mock_probe_running_ = true; } - virtual void SendInfo() OVERRIDE { + virtual void SendInfo() override { last_status_sent_ = dns_probe_status(); mock_sent_count_++; } @@ -54,7 +54,7 @@ class NetErrorTabHelperTest : public ChromeRenderViewHostTestHarness { enum ErrorPage { NORMAL_PAGE, ERROR_PAGE }; enum ErrorType { DNS_ERROR, OTHER_ERROR }; - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); subframe_ = content::RenderFrameHostTester::For(main_rfh()) ->AppendChild("subframe"); diff --git a/chrome/browser/net/net_log_temp_file_unittest.cc b/chrome/browser/net/net_log_temp_file_unittest.cc index b3fce9e..c7d24b2 100644 --- a/chrome/browser/net/net_log_temp_file_unittest.cc +++ b/chrome/browser/net/net_log_temp_file_unittest.cc @@ -25,13 +25,13 @@ class TestNetLogTempFile : public NetLogTempFile { } // NetLogTempFile implementation: - virtual bool GetNetExportLogDirectory(base::FilePath* path) OVERRIDE { + virtual bool GetNetExportLogDirectory(base::FilePath* path) override { if (lie_about_net_export_log_directory_) return false; return NetLogTempFile::GetNetExportLogDirectory(path); } - virtual bool NetExportLogExists() OVERRIDE { + virtual bool NetExportLogExists() override { if (lie_about_file_existence_) return false; return NetLogTempFile::NetExportLogExists(); @@ -61,7 +61,7 @@ class NetLogTempFileTest : public ::testing::Test { } // ::testing::Test implementation: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Get a temporary file name for unit tests. base::FilePath net_log_dir; ASSERT_TRUE(net_log_temp_file_->GetNetExportLogDirectory(&net_log_dir)); @@ -76,7 +76,7 @@ class NetLogTempFileTest : public ::testing::Test { ASSERT_FALSE(net_export_log_.empty()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Delete the temporary file we have created. ASSERT_TRUE(base::DeleteFile(net_export_log_, false)); } diff --git a/chrome/browser/net/predictor.h b/chrome/browser/net/predictor.h index ad8df5c..097a238 100644 --- a/chrome/browser/net/predictor.h +++ b/chrome/browser/net/predictor.h @@ -610,12 +610,12 @@ class SimplePredictor : public Predictor { PrefService* local_state, IOThread* io_thread, net::URLRequestContextGetter* getter, - ProfileIOData* profile_io_data) OVERRIDE; - virtual void ShutdownOnUIThread() OVERRIDE; + ProfileIOData* profile_io_data) override; + virtual void ShutdownOnUIThread() override; private: // These member functions return True for unittests. - virtual bool CanPrefetchAndPrerender() const OVERRIDE; - virtual bool CanPreresolveAndPreconnect() const OVERRIDE; + virtual bool CanPrefetchAndPrerender() const override; + virtual bool CanPreresolveAndPreconnect() const override; }; } // namespace chrome_browser_net diff --git a/chrome/browser/net/predictor_browsertest.cc b/chrome/browser/net/predictor_browsertest.cc index cc31bf3..d7ac2a2 100644 --- a/chrome/browser/net/predictor_browsertest.cc +++ b/chrome/browser/net/predictor_browsertest.cc @@ -33,7 +33,7 @@ class HostResolutionRequestRecorder : public net::HostResolverProc { net::AddressFamily address_family, net::HostResolverFlags host_resolver_flags, net::AddressList* addrlist, - int* os_error) OVERRIDE { + int* os_error) override { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, @@ -102,13 +102,13 @@ class PredictorBrowserTest : public InProcessBrowserTest { } protected: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { scoped_host_resolver_proc_.reset(new net::ScopedDefaultHostResolverProc( host_resolution_request_recorder_.get())); InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { InProcessBrowserTest::TearDownInProcessBrowserTestFixture(); scoped_host_resolver_proc_.reset(); } diff --git a/chrome/browser/net/predictor_tab_helper.h b/chrome/browser/net/predictor_tab_helper.h index 9ed4ee6..059d392 100644 --- a/chrome/browser/net/predictor_tab_helper.h +++ b/chrome/browser/net/predictor_tab_helper.h @@ -21,7 +21,7 @@ class PredictorTabHelper // content::WebContentsObserver implementation virtual void DidStartNavigationToPendingEntry( const GURL& url, - content::NavigationController::ReloadType reload_type) OVERRIDE; + content::NavigationController::ReloadType reload_type) override; private: explicit PredictorTabHelper(content::WebContents* web_contents); diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc index 4bdb21d..fe56288 100644 --- a/chrome/browser/net/predictor_unittest.cc +++ b/chrome/browser/net/predictor_unittest.cc @@ -704,7 +704,7 @@ class TestPredictorObserver : public PredictorObserver { virtual void OnPreconnectUrl(const GURL& url, const GURL& first_party_for_cookies, UrlInfo::ResolutionMotivation motivation, - int count) OVERRIDE { + int count) override { preconnected_urls_.push_back(url); } @@ -780,11 +780,11 @@ class TestProxyAdvisor : public ProxyAdvisor { virtual void Advise(const GURL& url, UrlInfo::ResolutionMotivation motivation, - bool is_preconnect) OVERRIDE { + bool is_preconnect) override { ++advise_count_; } - virtual bool WouldProxyURL(const GURL& url) OVERRIDE { + virtual bool WouldProxyURL(const GURL& url) override { ++would_proxy_count_; return would_proxy_; } diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.h b/chrome/browser/net/pref_proxy_config_tracker_impl.h index 4e1aa00..57f4981 100644 --- a/chrome/browser/net/pref_proxy_config_tracker_impl.h +++ b/chrome/browser/net/pref_proxy_config_tracker_impl.h @@ -39,12 +39,12 @@ class ChromeProxyConfigService // ProxyConfigService implementation: virtual void AddObserver( - net::ProxyConfigService::Observer* observer) OVERRIDE; + net::ProxyConfigService::Observer* observer) override; virtual void RemoveObserver( - net::ProxyConfigService::Observer* observer) OVERRIDE; + net::ProxyConfigService::Observer* observer) override; virtual ConfigAvailability GetLatestProxyConfig( - net::ProxyConfig* config) OVERRIDE; - virtual void OnLazyPoll() OVERRIDE; + net::ProxyConfig* config) override; + virtual void OnLazyPoll() override; // Method on IO thread that receives the preference proxy settings pushed from // PrefProxyConfigTrackerImpl. @@ -54,7 +54,7 @@ class ChromeProxyConfigService private: // ProxyConfigService::Observer implementation: virtual void OnProxyConfigChanged(const net::ProxyConfig& config, - ConfigAvailability availability) OVERRIDE; + ConfigAvailability availability) override; // Makes sure that the observer registration with the base service is set up. void RegisterObserver(); @@ -89,11 +89,11 @@ class PrefProxyConfigTrackerImpl : public PrefProxyConfigTracker { // PrefProxyConfigTracker implementation: virtual scoped_ptr<net::ProxyConfigService> CreateTrackingProxyConfigService( - scoped_ptr<net::ProxyConfigService> base_service) OVERRIDE; + scoped_ptr<net::ProxyConfigService> base_service) override; // Notifies the tracker that the pref service passed upon construction is // about to go away. This must be called from the UI thread. - virtual void DetachFromPrefService() OVERRIDE; + virtual void DetachFromPrefService() override; // Determines if |config_state| takes precedence regardless, which happens if // config is from policy or extension or other-precede. diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc index 60fd28e..7aa7c52 100644 --- a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc +++ b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc @@ -44,17 +44,17 @@ class TestProxyConfigService : public net::ProxyConfigService { private: virtual void AddObserver( - net::ProxyConfigService::Observer* observer) OVERRIDE { + net::ProxyConfigService::Observer* observer) override { observers_.AddObserver(observer); } virtual void RemoveObserver( - net::ProxyConfigService::Observer* observer) OVERRIDE { + net::ProxyConfigService::Observer* observer) override { observers_.RemoveObserver(observer); } virtual net::ProxyConfigService::ConfigAvailability GetLatestProxyConfig( - net::ProxyConfig* config) OVERRIDE { + net::ProxyConfig* config) override { *config = config_; return availability_; } diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc index e197f44..2800d61 100644 --- a/chrome/browser/net/proxy_browsertest.cc +++ b/chrome/browser/net/proxy_browsertest.cc @@ -54,7 +54,7 @@ class LoginPromptObserver : public content::NotificationObserver { virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { if (type == chrome::NOTIFICATION_AUTH_NEEDED) { LoginNotificationDetails* login_details = content::Details<LoginNotificationDetails>(details).ptr(); @@ -82,12 +82,12 @@ class ProxyBrowserTest : public InProcessBrowserTest { base::FilePath()) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(proxy_server_.Start()); InProcessBrowserTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitchASCII(switches::kProxyServer, proxy_server_.host_port_pair().ToString()); } @@ -152,12 +152,12 @@ class HttpProxyScriptBrowserTest : public InProcessBrowserTest { } virtual ~HttpProxyScriptBrowserTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(http_server_.Start()); InProcessBrowserTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { base::FilePath pac_script_path(FILE_PATH_LITERAL("files")); command_line->AppendSwitchASCII(switches::kProxyPacUrl, http_server_.GetURL( pac_script_path.Append(kPACScript).MaybeAsASCII()).spec()); @@ -179,7 +179,7 @@ class FileProxyScriptBrowserTest : public InProcessBrowserTest { FileProxyScriptBrowserTest() {} virtual ~FileProxyScriptBrowserTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitchASCII(switches::kProxyPacUrl, ui_test_utils::GetTestUrl( base::FilePath(base::FilePath::kCurrentDirectory), @@ -204,12 +204,12 @@ class FtpProxyScriptBrowserTest : public InProcessBrowserTest { } virtual ~FtpProxyScriptBrowserTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(ftp_server_.Start()); InProcessBrowserTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { base::FilePath pac_script_path(kPACScript); command_line->AppendSwitchASCII( switches::kProxyPacUrl, @@ -232,7 +232,7 @@ class DataProxyScriptBrowserTest : public InProcessBrowserTest { DataProxyScriptBrowserTest() {} virtual ~DataProxyScriptBrowserTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { std::string contents; // Read in kPACScript contents. ASSERT_TRUE(base::ReadFileToString(ui_test_utils::GetTestFilePath( diff --git a/chrome/browser/net/proxy_policy_handler.h b/chrome/browser/net/proxy_policy_handler.h index 2af0a65..f9d416c 100644 --- a/chrome/browser/net/proxy_policy_handler.h +++ b/chrome/browser/net/proxy_policy_handler.h @@ -41,9 +41,9 @@ class ProxyPolicyHandler : public ConfigurationPolicyHandler { // ConfigurationPolicyHandler methods: virtual bool CheckPolicySettings(const PolicyMap& policies, - PolicyErrorMap* errors) OVERRIDE; + PolicyErrorMap* errors) override; virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: const base::Value* GetProxyPolicyValue(const PolicyMap& policies, diff --git a/chrome/browser/net/proxy_policy_handler_unittest.cc b/chrome/browser/net/proxy_policy_handler_unittest.cc index 67449d3..6be9305 100644 --- a/chrome/browser/net/proxy_policy_handler_unittest.cc +++ b/chrome/browser/net/proxy_policy_handler_unittest.cc @@ -22,7 +22,7 @@ namespace policy { class ProxyPolicyHandlerTest : public ConfigurationPolicyPrefStoreTest { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ConfigurationPolicyPrefStoreTest::SetUp(); handler_list_.AddHandler( make_scoped_ptr<ConfigurationPolicyHandler>(new ProxyPolicyHandler)); diff --git a/chrome/browser/net/quota_policy_channel_id_store.h b/chrome/browser/net/quota_policy_channel_id_store.h index 9ec173f..5d32be6 100644 --- a/chrome/browser/net/quota_policy_channel_id_store.h +++ b/chrome/browser/net/quota_policy_channel_id_store.h @@ -42,12 +42,12 @@ class QuotaPolicyChannelIDStore special_storage_policy); // net::DefaultChannelIDStore::PersistentStore: - virtual void Load(const LoadedCallback& loaded_callback) OVERRIDE; + virtual void Load(const LoadedCallback& loaded_callback) override; virtual void AddChannelID( - const net::DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE; + const net::DefaultChannelIDStore::ChannelID& channel_id) override; virtual void DeleteChannelID( - const net::DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE; - virtual void SetForceKeepSessionState() OVERRIDE; + const net::DefaultChannelIDStore::ChannelID& channel_id) override; + virtual void SetForceKeepSessionState() override; private: typedef ScopedVector<net::DefaultChannelIDStore::ChannelID> ChannelIDVector; diff --git a/chrome/browser/net/sdch_browsertest.cc b/chrome/browser/net/sdch_browsertest.cc index 2e552e7..0e0f76b 100644 --- a/chrome/browser/net/sdch_browsertest.cc +++ b/chrome/browser/net/sdch_browsertest.cc @@ -520,7 +520,7 @@ class SdchBrowserTest : public InProcessBrowserTest, net::URLFetcherDelegate { } // InProcessBrowserTest - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(base::CommandLine* command_line) override { command_line->AppendSwitchASCII( switches::kHostResolverRules, "MAP " + std::string(kTestHost) + " 127.0.0.1"); @@ -530,7 +530,7 @@ class SdchBrowserTest : public InProcessBrowserTest, net::URLFetcherDelegate { #endif } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { test_server_.RegisterRequestHandler( base::Bind(&SdchResponseHandler::HandleRequest, base::Unretained(&response_handler_))); @@ -538,12 +538,12 @@ class SdchBrowserTest : public InProcessBrowserTest, net::URLFetcherDelegate { url_request_context_getter_ = browser()->profile()->GetRequestContext(); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { CHECK(test_server_.ShutdownAndWaitUntilComplete()); } // URLFetcherDelegate - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE { + virtual void OnURLFetchComplete(const net::URLFetcher* source) override { url_fetch_complete_ = true; if (waiting_) base::MessageLoopForUI::current()->Quit(); diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h index 72c7d49..67fd4aa 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h @@ -36,20 +36,20 @@ class DataReductionProxyChromeConfigurator bool fallback_restricted, const std::string& primary_origin, const std::string& fallback_origin, - const std::string& ssl_origin) OVERRIDE; - virtual void Disable() OVERRIDE; + const std::string& ssl_origin) override; + virtual void Disable() override; // Add a host pattern to bypass. This should follow the same syntax used // in net::ProxyBypassRules; that is, a hostname pattern, a hostname suffix // pattern, an IP literal, a CIDR block, or the magic string '<local>'. // Bypass settings persist for the life of this object and are applied // each time the proxy is enabled, but are not updated while it is enabled. - virtual void AddHostPatternToBypass(const std::string& pattern) OVERRIDE; + virtual void AddHostPatternToBypass(const std::string& pattern) override; // Add a URL pattern to bypass the proxy. The base implementation strips // everything in |pattern| after the first single slash and then treats it // as a hostname pattern. Subclasses may implement other semantics. - virtual void AddURLPatternToBypass(const std::string& pattern) OVERRIDE; + virtual void AddURLPatternToBypass(const std::string& pattern) override; // Updates the config for use on the IO thread. void UpdateProxyConfigOnIO(const net::ProxyConfig& config); diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h index bf31500..69e5549 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h @@ -40,7 +40,7 @@ class DataReductionProxyChromeSettingsFactory // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; DISALLOW_COPY_AND_ASSIGN(DataReductionProxyChromeSettingsFactory); }; diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_infobar_delegate.h b/chrome/browser/net/spdyproxy/data_reduction_proxy_infobar_delegate.h index 3c7cc13..13a4dd1 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_infobar_delegate.h +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_infobar_delegate.h @@ -33,10 +33,10 @@ class DataReductionProxyInfoBarDelegate : public ConfirmInfoBarDelegate { scoped_ptr<DataReductionProxyInfoBarDelegate> delegate); // ConfirmInfoBarDelegate - virtual base::string16 GetMessageText() const OVERRIDE; - virtual int GetButtons() const OVERRIDE; - virtual bool ShouldExpire(const NavigationDetails& details) const OVERRIDE; - virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE; + virtual base::string16 GetMessageText() const override; + virtual int GetButtons() const override; + virtual bool ShouldExpire(const NavigationDetails& details) const override; + virtual bool LinkClicked(WindowOpenDisposition disposition) override; std::string link_url_; diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc index d51f763..39661e1 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc @@ -39,7 +39,7 @@ class TestDataReductionProxySettingsAndroid settings_(settings) {} // Returns the provided setting object. Used by wrapping methods. - virtual DataReductionProxySettings* Settings() OVERRIDE { + virtual DataReductionProxySettings* Settings() override { return settings_; } @@ -126,7 +126,7 @@ class DataReductionProxySettingsAndroidTest DataReductionProxyChromeSettings> { public: // DataReductionProxySettingsTest implementation: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { env_ = base::android::AttachCurrentThread(); DataReductionProxySettingsAndroid::Register(env_); DataReductionProxySettingsTestBase::SetUp(); diff --git a/chrome/browser/net/spdyproxy/proxy_advisor.h b/chrome/browser/net/spdyproxy/proxy_advisor.h index 694e7d6..a18c8bf 100644 --- a/chrome/browser/net/spdyproxy/proxy_advisor.h +++ b/chrome/browser/net/spdyproxy/proxy_advisor.h @@ -41,9 +41,9 @@ class ProxyAdvisor : public net::URLRequest::Delegate { virtual ~ProxyAdvisor(); // net::URLRequest::Delegate callbacks. - virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE; + virtual void OnResponseStarted(net::URLRequest* request) override; virtual void OnReadCompleted(net::URLRequest* request, - int bytes_read) OVERRIDE; + int bytes_read) override; // Tell the advisor that |url| is being preconnected or pre-resolved and why. // If |url| would be proxied (according to WouldProxyURL()), the ProxyAdvisor diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc index 4771d88..9ae2747 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc @@ -109,7 +109,7 @@ class SSLConfigServicePref : public net::SSLConfigService { SSLConfigServicePref() {} // Store SSL config settings in |config|. Must only be called from IO thread. - virtual void GetSSLConfig(net::SSLConfig* config) OVERRIDE; + virtual void GetSSLConfig(net::SSLConfig* config) override; private: // Allow the pref watcher to update our internal state. @@ -151,7 +151,7 @@ class SSLConfigServiceManagerPref // Register local_state SSL preferences. static void RegisterPrefs(PrefRegistrySimple* registry); - virtual net::SSLConfigService* Get() OVERRIDE; + virtual net::SSLConfigService* Get() override; private: // Callback for preference changes. This will post the changes to the IO diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc index 926e9b9..9adf29a 100644 --- a/chrome/browser/net/websocket_browsertest.cc +++ b/chrome/browser/net/websocket_browsertest.cc @@ -55,14 +55,14 @@ class WebSocketBrowserTest : public InProcessBrowserTest { } // Prepare the title watcher. - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { watcher_.reset(new content::TitleWatcher( browser()->tab_strip_model()->GetActiveWebContents(), base::ASCIIToUTF16("PASS"))); watcher_->AlsoWaitForTitle(base::ASCIIToUTF16("FAIL")); } - virtual void TearDownOnMainThread() OVERRIDE { watcher_.reset(); } + virtual void TearDownOnMainThread() override { watcher_.reset(); } std::string WaitAndGetTitle() { return base::UTF16ToUTF8(watcher_->WaitAndGetTitle()); @@ -90,7 +90,7 @@ class WebSocketBrowserConnectToTest : public WebSocketBrowserTest { // The title watcher and HTTP server are set up automatically by the test // framework. Each test case still needs to configure and start the // WebSocket server(s) it needs. - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { WebSocketBrowserTest::SetUpOnMainThread(); ASSERT_TRUE(http_server_.StartInBackground()); } @@ -129,7 +129,7 @@ class AutoLogin : public content::NotificationObserver { // NotificationObserver implementation virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { DCHECK_EQ(chrome::NOTIFICATION_AUTH_NEEDED, type); scoped_refptr<LoginHandler> login_handler = content::Details<LoginNotificationDetails>(details)->handler(); diff --git a/chrome/browser/notifications/desktop_notification_infobar_delegate.h b/chrome/browser/notifications/desktop_notification_infobar_delegate.h index bed0eb5..4f5b876 100644 --- a/chrome/browser/notifications/desktop_notification_infobar_delegate.h +++ b/chrome/browser/notifications/desktop_notification_infobar_delegate.h @@ -28,8 +28,8 @@ class DesktopNotificationInfoBarDelegate : public PermissionInfobarDelegate { virtual ~DesktopNotificationInfoBarDelegate(); // PermissionInfoBarDelegate: - virtual base::string16 GetMessageText() const OVERRIDE; - virtual int GetIconID() const OVERRIDE; + virtual base::string16 GetMessageText() const override; + virtual int GetIconID() const override; GURL requesting_frame_; std::string display_languages_; diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h index d68e965..ce26a70 100644 --- a/chrome/browser/notifications/desktop_notification_service.h +++ b/chrome/browser/notifications/desktop_notification_service.h @@ -136,13 +136,13 @@ class DesktopNotificationService : public PermissionContextBase virtual void OnExtensionUninstalled( content::BrowserContext* browser_context, const extensions::Extension* extension, - extensions::UninstallReason reason) OVERRIDE; + extensions::UninstallReason reason) override; #endif // PermissionContextBase: virtual void UpdateContentSetting(const GURL& requesting_origin, const GURL& embedder_origin, - bool allowed) OVERRIDE; + bool allowed) override; // The profile which owns this object. Profile* profile_; diff --git a/chrome/browser/notifications/desktop_notification_service_factory.h b/chrome/browser/notifications/desktop_notification_service_factory.h index 9f705d1..63bcc1c 100644 --- a/chrome/browser/notifications/desktop_notification_service_factory.h +++ b/chrome/browser/notifications/desktop_notification_service_factory.h @@ -32,9 +32,9 @@ class DesktopNotificationServiceFactory // BrowserContextKeyedServiceFactory: 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; }; #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_FACTORY_H_ diff --git a/chrome/browser/notifications/extension_welcome_notification.cc b/chrome/browser/notifications/extension_welcome_notification.cc index def1e01..1963c3b 100644 --- a/chrome/browser/notifications/extension_welcome_notification.cc +++ b/chrome/browser/notifications/extension_welcome_notification.cc @@ -47,10 +47,10 @@ class NotificationCallbacks } // Overridden from NotificationDelegate: - virtual void Display() OVERRIDE {} - virtual void Error() OVERRIDE {} + virtual void Display() override {} + virtual void Error() override {} - virtual void Close(bool by_user) OVERRIDE { + virtual void Close(bool by_user) override { if (by_user) { // Setting the preference here may cause the notification erasing // to reenter. Posting a task avoids this issue. @@ -60,8 +60,8 @@ class NotificationCallbacks } } - virtual void Click() OVERRIDE {} - virtual void ButtonClick(int index) OVERRIDE { + virtual void Click() override {} + virtual void ButtonClick(int index) override { if (index == 0) { OpenNotificationLearnMoreTab(); } else if (index == 1) { @@ -116,17 +116,17 @@ class DefaultDelegate : public ExtensionWelcomeNotification::Delegate { public: DefaultDelegate() {} - virtual message_center::MessageCenter* GetMessageCenter() OVERRIDE { + virtual message_center::MessageCenter* GetMessageCenter() override { return g_browser_process->message_center(); } - virtual base::Time GetCurrentTime() OVERRIDE { + virtual base::Time GetCurrentTime() override { return base::Time::Now(); } virtual void PostTask( const tracked_objects::Location& from_here, - const base::Closure& task) OVERRIDE { + const base::Closure& task) override { base::MessageLoop::current()->PostTask(from_here, task); } diff --git a/chrome/browser/notifications/extension_welcome_notification.h b/chrome/browser/notifications/extension_welcome_notification.h index b45b0ff..fd26c07 100644 --- a/chrome/browser/notifications/extension_welcome_notification.h +++ b/chrome/browser/notifications/extension_welcome_notification.h @@ -76,7 +76,7 @@ class ExtensionWelcomeNotification : public KeyedService, Delegate* const delegate); // PrefServiceSyncableObserver - virtual void OnIsSyncingChanged() OVERRIDE; + virtual void OnIsSyncingChanged() override; // Adds in the welcome notification if required for components built // into Chrome that show notifications like Chrome Now. diff --git a/chrome/browser/notifications/extension_welcome_notification_factory.h b/chrome/browser/notifications/extension_welcome_notification_factory.h index 975ab14..194e8dc 100644 --- a/chrome/browser/notifications/extension_welcome_notification_factory.h +++ b/chrome/browser/notifications/extension_welcome_notification_factory.h @@ -29,9 +29,9 @@ class ExtensionWelcomeNotificationFactory // BrowserContextKeyedServiceFactory: 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; }; #endif // CHROME_BROWSER_NOTIFICATIONS_EXTENSION_WELCOME_NOTIFICATION_FACTORY_H_ diff --git a/chrome/browser/notifications/extension_welcome_notification_unittest.cc b/chrome/browser/notifications/extension_welcome_notification_unittest.cc index 8dcde90a..b523376 100644 --- a/chrome/browser/notifications/extension_welcome_notification_unittest.cc +++ b/chrome/browser/notifications/extension_welcome_notification_unittest.cc @@ -39,14 +39,14 @@ class MockMessageCenter : public message_center::FakeMessageCenter { // message_center::FakeMessageCenter Overrides virtual message_center::Notification* FindVisibleNotificationById( - const std::string& id) OVERRIDE { + const std::string& id) override { if (last_notification.get() && last_notification->id() == id) return last_notification.get(); return NULL; } virtual void AddNotification( - scoped_ptr<message_center::Notification> notification) OVERRIDE { + scoped_ptr<message_center::Notification> notification) override { EXPECT_FALSE(last_notification.get()); last_notification.swap(notification); add_notification_calls_++; @@ -55,7 +55,7 @@ class MockMessageCenter : public message_center::FakeMessageCenter { } virtual void RemoveNotification(const std::string& id, - bool by_user) OVERRIDE { + bool by_user) override { EXPECT_TRUE(last_notification.get()); last_notification.reset(); remove_notification_calls_++; @@ -85,17 +85,17 @@ public: } // ExtensionWelcomeNotification::Delegate - virtual message_center::MessageCenter* GetMessageCenter() OVERRIDE { + virtual message_center::MessageCenter* GetMessageCenter() override { return message_center_.get(); } - virtual base::Time GetCurrentTime() OVERRIDE { + virtual base::Time GetCurrentTime() override { return start_time_ + elapsed_time_; } virtual void PostTask( const tracked_objects::Location& from_here, - const base::Closure& task) OVERRIDE { + const base::Closure& task) override { EXPECT_TRUE(pending_task_.is_null()); pending_task_ = task; } @@ -209,15 +209,15 @@ class ExtensionWelcomeNotificationTest : public testing::Test { explicit TestNotificationDelegate(const std::string& id) : id_(id) {} // Overridden from NotificationDelegate: - virtual void Display() OVERRIDE {} - virtual void Error() OVERRIDE {} - virtual void Close(bool by_user) OVERRIDE {} - virtual void Click() OVERRIDE {} - virtual void ButtonClick(int index) OVERRIDE {} + virtual void Display() override {} + virtual void Error() override {} + virtual void Close(bool by_user) override {} + virtual void Click() override {} + virtual void ButtonClick(int index) override {} - virtual std::string id() const OVERRIDE { return id_; } + virtual std::string id() const override { return id_; } - virtual content::WebContents* GetWebContents() const OVERRIDE { + virtual content::WebContents* GetWebContents() const override { return NULL; } diff --git a/chrome/browser/notifications/fullscreen_notification_blocker.h b/chrome/browser/notifications/fullscreen_notification_blocker.h index 11df3f3..de51ec0 100644 --- a/chrome/browser/notifications/fullscreen_notification_blocker.h +++ b/chrome/browser/notifications/fullscreen_notification_blocker.h @@ -22,15 +22,15 @@ class FullscreenNotificationBlocker bool is_fullscreen_mode() const { return is_fullscreen_mode_; } // message_center::NotificationBlocker overrides: - virtual void CheckState() OVERRIDE; + virtual void CheckState() override; virtual bool ShouldShowNotificationAsPopup( - const message_center::NotifierId& notifier_id) const OVERRIDE; + const message_center::NotifierId& notifier_id) const override; private: // content::NotificationObserver override. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; bool is_fullscreen_mode_; diff --git a/chrome/browser/notifications/google_now_notification_stats_collector.h b/chrome/browser/notifications/google_now_notification_stats_collector.h index 47c0ffe..3ead046 100644 --- a/chrome/browser/notifications/google_now_notification_stats_collector.h +++ b/chrome/browser/notifications/google_now_notification_stats_collector.h @@ -24,9 +24,9 @@ class GoogleNowNotificationStatsCollector // MessageCenterObserver virtual void OnNotificationDisplayed( const std::string& notification_id, - const message_center::DisplaySource source) OVERRIDE; + const message_center::DisplaySource source) override; virtual void OnCenterVisibilityChanged( - message_center::Visibility visibility) OVERRIDE; + message_center::Visibility visibility) override; // Counts the number of Google Now Notifications in the message center. int CountVisibleGoogleNowNotifications(); diff --git a/chrome/browser/notifications/login_state_notification_blocker_chromeos.h b/chrome/browser/notifications/login_state_notification_blocker_chromeos.h index 43bf874..e491b5c 100644 --- a/chrome/browser/notifications/login_state_notification_blocker_chromeos.h +++ b/chrome/browser/notifications/login_state_notification_blocker_chromeos.h @@ -30,18 +30,18 @@ class LoginStateNotificationBlockerChromeOS private: // message_center::NotificationBlocker overrides: virtual bool ShouldShowNotificationAsPopup( - const message_center::NotifierId& notifier_id) const OVERRIDE; + const message_center::NotifierId& notifier_id) const override; // ash::ShellObserver overrides: - virtual void OnLockStateChanged(bool locked) OVERRIDE; - virtual void OnAppTerminating() OVERRIDE; + virtual void OnLockStateChanged(bool locked) override; + virtual void OnAppTerminating() override; // chromeos::LoginState::Observer overrides: - virtual void LoggedInStateChanged() OVERRIDE; + virtual void LoggedInStateChanged() override; // chromeos::UserAddingScreen::Observer overrides: - virtual void OnUserAddingStarted() OVERRIDE; - virtual void OnUserAddingFinished() OVERRIDE; + virtual void OnUserAddingStarted() override; + virtual void OnUserAddingFinished() override; bool locked_; bool observing_; diff --git a/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc b/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc index 2f83bc1..a8491cc 100644 --- a/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc +++ b/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc @@ -30,12 +30,12 @@ class LoginStateNotificationBlockerChromeOSBrowserTest state_changed_count_(0) {} virtual ~LoginStateNotificationBlockerChromeOSBrowserTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { chromeos::LoginState::Get()->set_always_logged_in(false); chromeos::LoginManagerTest::SetUpOnMainThread(); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { if (blocker_) blocker_->RemoveObserver(this); blocker_.reset(); @@ -51,7 +51,7 @@ class LoginStateNotificationBlockerChromeOSBrowserTest // message_center::NotificationBlocker::Observer ovverrides: virtual void OnBlockingStateChanged( - message_center::NotificationBlocker* blocker) OVERRIDE { + message_center::NotificationBlocker* blocker) override { state_changed_count_++; } diff --git a/chrome/browser/notifications/login_state_notification_blocker_chromeos_unittest.cc b/chrome/browser/notifications/login_state_notification_blocker_chromeos_unittest.cc index 5a1f1b8..a2dda13 100644 --- a/chrome/browser/notifications/login_state_notification_blocker_chromeos_unittest.cc +++ b/chrome/browser/notifications/login_state_notification_blocker_chromeos_unittest.cc @@ -20,7 +20,7 @@ class LoginStateNotificationBlockerChromeOSTest virtual ~LoginStateNotificationBlockerChromeOSTest() {} // ash::tests::AshTestBase overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { chromeos::LoginState::Initialize(); chromeos::LoginState::Get()->set_always_logged_in(false); ash::test::AshTestBase::SetUp(); @@ -29,7 +29,7 @@ class LoginStateNotificationBlockerChromeOSTest blocker_->AddObserver(this); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { blocker_->RemoveObserver(this); blocker_.reset(); ash::test::AshTestBase::TearDown(); @@ -38,7 +38,7 @@ class LoginStateNotificationBlockerChromeOSTest // message_center::NotificationBlocker::Observer overrides: virtual void OnBlockingStateChanged( - message_center::NotificationBlocker* blocker) OVERRIDE { + message_center::NotificationBlocker* blocker) override { state_changed_count_++; } diff --git a/chrome/browser/notifications/message_center_notification_manager.h b/chrome/browser/notifications/message_center_notification_manager.h index 6fa5d78..af449a7 100644 --- a/chrome/browser/notifications/message_center_notification_manager.h +++ b/chrome/browser/notifications/message_center_notification_manager.h @@ -52,26 +52,26 @@ class MessageCenterNotificationManager // NotificationUIManager virtual void Add(const Notification& notification, - Profile* profile) OVERRIDE; + Profile* profile) override; virtual bool Update(const Notification& notification, - Profile* profile) OVERRIDE; + Profile* profile) override; virtual const Notification* FindById(const std::string& delegate_id, - ProfileID profile_id) const OVERRIDE; + ProfileID profile_id) const override; virtual bool CancelById(const std::string& delegate_id, - ProfileID profile_id) OVERRIDE; + ProfileID profile_id) override; virtual std::set<std::string> GetAllIdsByProfileAndSourceOrigin( Profile* profile, - const GURL& source) OVERRIDE; - virtual bool CancelAllBySourceOrigin(const GURL& source_origin) OVERRIDE; - virtual bool CancelAllByProfile(ProfileID profile_id) OVERRIDE; - virtual void CancelAll() OVERRIDE; + const GURL& source) override; + virtual bool CancelAllBySourceOrigin(const GURL& source_origin) override; + virtual bool CancelAllByProfile(ProfileID profile_id) override; + virtual void CancelAll() override; // MessageCenterObserver virtual void OnNotificationRemoved(const std::string& notification_id, - bool by_user) OVERRIDE; - virtual void OnCenterVisibilityChanged(message_center::Visibility) OVERRIDE; + bool by_user) override; + virtual void OnCenterVisibilityChanged(message_center::Visibility) override; virtual void OnNotificationUpdated(const std::string& notification_id) - OVERRIDE; + override; void EnsureMessageCenterClosed(); @@ -169,7 +169,7 @@ class MessageCenterNotificationManager void StartDownloads(); // Overridden from ImageDownloadsObserver. - virtual void OnDownloadsCompleted() OVERRIDE; + virtual void OnDownloadsCompleted() override; Profile* profile() const { return profile_; } const Notification& notification() const { return notification_; } diff --git a/chrome/browser/notifications/message_center_notifications_browsertest.cc b/chrome/browser/notifications/message_center_notifications_browsertest.cc index a475041..9563d61 100644 --- a/chrome/browser/notifications/message_center_notifications_browsertest.cc +++ b/chrome/browser/notifications/message_center_notifications_browsertest.cc @@ -31,14 +31,14 @@ class TestAddObserver : public message_center::MessageCenterObserver { virtual ~TestAddObserver() { message_center_->RemoveObserver(this); } - virtual void OnNotificationAdded(const std::string& id) OVERRIDE { + virtual void OnNotificationAdded(const std::string& id) override { std::string log = logs_[id]; if (log != "") log += "_"; logs_[id] = log + "add-" + id; } - virtual void OnNotificationUpdated(const std::string& id) OVERRIDE { + virtual void OnNotificationUpdated(const std::string& id) override { std::string log = logs_[id]; if (log != "") log += "_"; @@ -72,19 +72,19 @@ class MessageCenterNotificationsTest : public InProcessBrowserTest { public: explicit TestDelegate(const std::string& id) : id_(id) {} - virtual void Display() OVERRIDE { log_ += "Display_"; } - virtual void Error() OVERRIDE { log_ += "Error_"; } - virtual void Close(bool by_user) OVERRIDE { + virtual void Display() override { log_ += "Display_"; } + virtual void Error() override { log_ += "Error_"; } + virtual void Close(bool by_user) override { log_ += "Close_"; log_ += ( by_user ? "by_user_" : "programmatically_"); } - virtual void Click() OVERRIDE { log_ += "Click_"; } - virtual void ButtonClick(int button_index) OVERRIDE { + virtual void Click() override { log_ += "Click_"; } + virtual void ButtonClick(int button_index) override { log_ += "ButtonClick_"; log_ += base::IntToString(button_index) + "_"; } - virtual std::string id() const OVERRIDE { return id_; } - virtual content::WebContents* GetWebContents() const OVERRIDE { + virtual std::string id() const override { return id_; } + virtual content::WebContents* GetWebContents() const override { return NULL; } diff --git a/chrome/browser/notifications/message_center_settings_controller.h b/chrome/browser/notifications/message_center_settings_controller.h index 92effbd..408db71 100644 --- a/chrome/browser/notifications/message_center_settings_controller.h +++ b/chrome/browser/notifications/message_center_settings_controller.h @@ -57,42 +57,42 @@ class MessageCenterSettingsController // Overridden from message_center::NotifierSettingsProvider. virtual void AddObserver( - message_center::NotifierSettingsObserver* observer) OVERRIDE; + message_center::NotifierSettingsObserver* observer) override; virtual void RemoveObserver( - message_center::NotifierSettingsObserver* observer) OVERRIDE; - virtual size_t GetNotifierGroupCount() const OVERRIDE; + message_center::NotifierSettingsObserver* observer) override; + virtual size_t GetNotifierGroupCount() const override; virtual const message_center::NotifierGroup& GetNotifierGroupAt( - size_t index) const OVERRIDE; - virtual bool IsNotifierGroupActiveAt(size_t index) const OVERRIDE; - virtual void SwitchToNotifierGroup(size_t index) OVERRIDE; + size_t index) const override; + virtual bool IsNotifierGroupActiveAt(size_t index) const override; + virtual void SwitchToNotifierGroup(size_t index) override; virtual const message_center::NotifierGroup& GetActiveNotifierGroup() const - OVERRIDE; + override; virtual void GetNotifierList( - std::vector<message_center::Notifier*>* notifiers) OVERRIDE; + std::vector<message_center::Notifier*>* notifiers) override; virtual void SetNotifierEnabled(const message_center::Notifier& notifier, - bool enabled) OVERRIDE; - virtual void OnNotifierSettingsClosing() OVERRIDE; + bool enabled) override; + virtual void OnNotifierSettingsClosing() override; virtual bool NotifierHasAdvancedSettings( - const message_center::NotifierId& notifier_id) const OVERRIDE; + const message_center::NotifierId& notifier_id) const override; virtual void OnNotifierAdvancedSettingsRequested( const message_center::NotifierId& notifier_id, - const std::string* notification_id) OVERRIDE; + const std::string* notification_id) override; #if defined(OS_CHROMEOS) // Overridden from user_manager::UserManager::UserSessionStateObserver. virtual void ActiveUserChanged( - const user_manager::User* active_user) OVERRIDE; + const user_manager::User* active_user) override; #endif // Overridden from extensions::AppIconLoader::Delegate. virtual void SetAppImage(const std::string& id, - const gfx::ImageSkia& image) OVERRIDE; + const gfx::ImageSkia& image) override; private: // Overridden from content::NotificationObserver. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; void OnFaviconLoaded(const GURL& url, const favicon_base::FaviconImageResult& favicon_result); diff --git a/chrome/browser/notifications/message_center_settings_controller_unittest.cc b/chrome/browser/notifications/message_center_settings_controller_unittest.cc index a181777..75670ee 100644 --- a/chrome/browser/notifications/message_center_settings_controller_unittest.cc +++ b/chrome/browser/notifications/message_center_settings_controller_unittest.cc @@ -32,7 +32,7 @@ class MessageCenterSettingsControllerTest : public testing::Test { .AppendASCII(base_name); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(testing_profile_manager_.SetUp()); } @@ -67,7 +67,7 @@ class MessageCenterSettingsControllerChromeOSTest MessageCenterSettingsControllerChromeOSTest() {} virtual ~MessageCenterSettingsControllerChromeOSTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { MessageCenterSettingsControllerTest::SetUp(); // Initialize the UserManager singleton to a fresh FakeUserManager instance. @@ -75,12 +75,12 @@ class MessageCenterSettingsControllerChromeOSTest new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { ResetController(); MessageCenterSettingsControllerTest::TearDown(); } - virtual void CreateProfile(const std::string& name) OVERRIDE { + virtual void CreateProfile(const std::string& name) override { MessageCenterSettingsControllerTest::CreateProfile(name); GetFakeUserManager()->AddUser(name); diff --git a/chrome/browser/notifications/message_center_stats_collector.h b/chrome/browser/notifications/message_center_stats_collector.h index b14cfb0..a64765e 100644 --- a/chrome/browser/notifications/message_center_stats_collector.h +++ b/chrome/browser/notifications/message_center_stats_collector.h @@ -63,21 +63,21 @@ class MessageCenterStatsCollector }; // MessageCenterObserver - virtual void OnNotificationAdded(const std::string& notification_id) OVERRIDE; + virtual void OnNotificationAdded(const std::string& notification_id) override; virtual void OnNotificationRemoved(const std::string& notification_id, - bool by_user) OVERRIDE; + bool by_user) override; virtual void OnNotificationUpdated( - const std::string& notification_id) OVERRIDE; + const std::string& notification_id) override; virtual void OnNotificationClicked( - const std::string& notification_id) OVERRIDE; + const std::string& notification_id) override; virtual void OnNotificationButtonClicked(const std::string& notification_id, - int button_index) OVERRIDE; + int button_index) override; virtual void OnNotificationDisplayed( const std::string& notification_id, - const message_center::DisplaySource source) OVERRIDE; + const message_center::DisplaySource source) override; virtual void OnCenterVisibilityChanged( - message_center::Visibility visibility) OVERRIDE; - virtual void OnQuietModeChanged(bool in_quiet_mode) OVERRIDE; + message_center::Visibility visibility) override; + virtual void OnQuietModeChanged(bool in_quiet_mode) override; // Weak, global. message_center::MessageCenter* message_center_; diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc index f189fea..fbbaeca 100644 --- a/chrome/browser/notifications/notification_browsertest.cc +++ b/chrome/browser/notifications/notification_browsertest.cc @@ -77,7 +77,7 @@ class MessageCenterChangeObserver } // NotificationChangeObserver: - virtual bool Wait() OVERRIDE { + virtual bool Wait() override { if (notification_received_) return true; @@ -88,17 +88,17 @@ class MessageCenterChangeObserver // message_center::MessageCenterObserver: virtual void OnNotificationAdded( - const std::string& notification_id) OVERRIDE { + const std::string& notification_id) override { OnMessageCenterChanged(); } virtual void OnNotificationRemoved(const std::string& notification_id, - bool by_user) OVERRIDE { + bool by_user) override { OnMessageCenterChanged(); } virtual void OnNotificationUpdated( - const std::string& notification_id) OVERRIDE { + const std::string& notification_id) override { OnMessageCenterChanged(); } diff --git a/chrome/browser/notifications/notification_conversion_helper_unittest.cc b/chrome/browser/notifications/notification_conversion_helper_unittest.cc index febf0d5..598f6237 100644 --- a/chrome/browser/notifications/notification_conversion_helper_unittest.cc +++ b/chrome/browser/notifications/notification_conversion_helper_unittest.cc @@ -18,9 +18,9 @@ class NotificationConversionHelperTest : public testing::Test { public: NotificationConversionHelperTest() {} - virtual void SetUp() OVERRIDE {} + virtual void SetUp() override {} - virtual void TearDown() OVERRIDE {} + virtual void TearDown() override {} protected: scoped_ptr<Notification> CreateNotification( diff --git a/chrome/browser/notifications/notification_object_proxy.h b/chrome/browser/notifications/notification_object_proxy.h index ea8c8ae..f35c756 100644 --- a/chrome/browser/notifications/notification_object_proxy.h +++ b/chrome/browser/notifications/notification_object_proxy.h @@ -29,12 +29,12 @@ class NotificationObjectProxy scoped_ptr<content::DesktopNotificationDelegate> delegate); // NotificationDelegate implementation. - virtual void Display() OVERRIDE; - virtual void Error() OVERRIDE; - virtual void Close(bool by_user) OVERRIDE; - virtual void Click() OVERRIDE; - virtual std::string id() const OVERRIDE; - virtual content::WebContents* GetWebContents() const OVERRIDE; + virtual void Display() override; + virtual void Error() override; + virtual void Close(bool by_user) override; + virtual void Click() override; + virtual std::string id() const override; + virtual content::WebContents* GetWebContents() const override; protected: friend class base::RefCountedThreadSafe<NotificationObjectProxy>; diff --git a/chrome/browser/notifications/notification_system_observer.h b/chrome/browser/notifications/notification_system_observer.h index 50a7eac..88ea169c 100644 --- a/chrome/browser/notifications/notification_system_observer.h +++ b/chrome/browser/notifications/notification_system_observer.h @@ -21,7 +21,7 @@ class NotificationSystemObserver : public content::NotificationObserver { // content::NotificationObserver override. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: // Registrar for the other kind of notifications (event signaling). diff --git a/chrome/browser/notifications/notification_test_util.h b/chrome/browser/notifications/notification_test_util.h index 58ff2b4..ff3b2f6 100644 --- a/chrome/browser/notifications/notification_test_util.h +++ b/chrome/browser/notifications/notification_test_util.h @@ -22,12 +22,12 @@ class MockNotificationDelegate : public NotificationDelegate { explicit MockNotificationDelegate(const std::string& id); // NotificationDelegate interface. - virtual void Display() OVERRIDE {} - virtual void Error() OVERRIDE {} - virtual void Close(bool by_user) OVERRIDE {} - virtual void Click() OVERRIDE {} - virtual std::string id() const OVERRIDE; - virtual content::WebContents* GetWebContents() const OVERRIDE; + virtual void Display() override {} + virtual void Error() override {} + virtual void Close(bool by_user) override {} + virtual void Click() override {} + virtual std::string id() const override; + virtual content::WebContents* GetWebContents() const override; private: virtual ~MockNotificationDelegate(); @@ -49,28 +49,28 @@ class LoggingNotificationDelegate : public NotificationDelegate { explicit LoggingNotificationDelegate(std::string id) : notification_id_(id) {} // NotificationObjectProxy override - virtual void Display() OVERRIDE { + virtual void Display() override { Logger::log("notification displayed\n"); } - virtual void Error() OVERRIDE { + virtual void Error() override { Logger::log("notification error\n"); } - virtual void Click() OVERRIDE { + virtual void Click() override { Logger::log("notification clicked\n"); } - virtual void ButtonClick(int index) OVERRIDE { + virtual void ButtonClick(int index) override { Logger::log("notification button clicked\n"); } - virtual void Close(bool by_user) OVERRIDE { + virtual void Close(bool by_user) override { if (by_user) Logger::log("notification closed by user\n"); else Logger::log("notification closed by script\n"); } - virtual std::string id() const OVERRIDE { + virtual std::string id() const override { return notification_id_; } - virtual content::WebContents* GetWebContents() const OVERRIDE { + virtual content::WebContents* GetWebContents() const override { return NULL; } @@ -86,36 +86,36 @@ class StubNotificationUIManager : public NotificationUIManager { virtual ~StubNotificationUIManager(); // Adds a notification to be displayed. Virtual for unit test override. - virtual void Add(const Notification& notification, Profile* profile) OVERRIDE; + virtual void Add(const Notification& notification, Profile* profile) override; virtual bool Update(const Notification& notification, - Profile* profile) OVERRIDE; + Profile* profile) override; // Returns NULL if no notifications match the supplied ID, either currently // displayed or in the queue. virtual const Notification* FindById(const std::string& delegate_id, - ProfileID profile_id) const OVERRIDE; + ProfileID profile_id) const override; // Removes any notifications matching the supplied ID, either currently // displayed or in the queue. Returns true if anything was removed. virtual bool CancelById(const std::string& delegate_id, - ProfileID profile_id) OVERRIDE; + ProfileID profile_id) override; // Adds the delegate_id for each outstanding notification to the set // |delegate_ids| (must not be NULL). virtual std::set<std::string> GetAllIdsByProfileAndSourceOrigin( Profile* profile, - const GURL& source) OVERRIDE; + const GURL& source) override; // Removes notifications matching the |source_origin| (which could be an // extension ID). Returns true if anything was removed. - virtual bool CancelAllBySourceOrigin(const GURL& source_origin) OVERRIDE; + virtual bool CancelAllBySourceOrigin(const GURL& source_origin) override; // Removes notifications matching |profile|. Returns true if any were removed. - virtual bool CancelAllByProfile(ProfileID profile_id) OVERRIDE; + virtual bool CancelAllByProfile(ProfileID profile_id) override; // Cancels all pending notifications and closes anything currently showing. // Used when the app is terminating. - virtual void CancelAll() OVERRIDE; + virtual void CancelAll() override; // Test hook to get the notification so we can check it const Notification& notification() const { return notification_; } diff --git a/chrome/browser/notifications/notification_ui_manager_android.h b/chrome/browser/notifications/notification_ui_manager_android.h index 61f913a..067d74d0 100644 --- a/chrome/browser/notifications/notification_ui_manager_android.h +++ b/chrome/browser/notifications/notification_ui_manager_android.h @@ -15,19 +15,19 @@ class NotificationUIManagerAndroid : public NotificationUIManager { virtual ~NotificationUIManagerAndroid(); // NotificationUIManager implementation; - virtual void Add(const Notification& notification, Profile* profile) OVERRIDE; + virtual void Add(const Notification& notification, Profile* profile) override; virtual bool Update(const Notification& notification, - Profile* profile) OVERRIDE; + Profile* profile) override; virtual const Notification* FindById(const std::string& delegate_id, - ProfileID profile_id) const OVERRIDE; + ProfileID profile_id) const override; virtual bool CancelById(const std::string& delegate_id, - ProfileID profile_id) OVERRIDE; + ProfileID profile_id) override; virtual std::set<std::string> GetAllIdsByProfileAndSourceOrigin( Profile* profile, - const GURL& source) OVERRIDE; - virtual bool CancelAllBySourceOrigin(const GURL& source_origin) OVERRIDE; - virtual bool CancelAllByProfile(Profile* profile) OVERRIDE; - virtual void CancelAll() OVERRIDE; + const GURL& source) override; + virtual bool CancelAllBySourceOrigin(const GURL& source_origin) override; + virtual bool CancelAllByProfile(Profile* profile) override; + virtual void CancelAll() override; private: DISALLOW_COPY_AND_ASSIGN(NotificationUIManagerAndroid); diff --git a/chrome/browser/notifications/screen_lock_notification_blocker.h b/chrome/browser/notifications/screen_lock_notification_blocker.h index 742936a..8c5c944 100644 --- a/chrome/browser/notifications/screen_lock_notification_blocker.h +++ b/chrome/browser/notifications/screen_lock_notification_blocker.h @@ -21,9 +21,9 @@ class ScreenLockNotificationBlocker bool is_locked() const { return is_locked_; } // message_center::NotificationBlocker overrides: - virtual void CheckState() OVERRIDE; + virtual void CheckState() override; virtual bool ShouldShowNotificationAsPopup( - const message_center::NotifierId& notifier_id) const OVERRIDE; + const message_center::NotifierId& notifier_id) const override; private: bool is_locked_; diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_service.h b/chrome/browser/notifications/sync_notifier/chrome_notifier_service.h index 15a9fa3..824203a 100644 --- a/chrome/browser/notifications/sync_notifier/chrome_notifier_service.h +++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_service.h @@ -27,7 +27,7 @@ class ChromeNotifierService : public KeyedService { virtual ~ChromeNotifierService(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // Returns the SyncableService for syncer::SYNCED_NOTIFICATIONS and // syncer::SYNCED_NOTIFICATION_APP_INFO diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_service_factory.h b/chrome/browser/notifications/sync_notifier/chrome_notifier_service_factory.h index c55d233..2cbf326 100644 --- a/chrome/browser/notifications/sync_notifier/chrome_notifier_service_factory.h +++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_service_factory.h @@ -38,7 +38,7 @@ class ChromeNotifierServiceFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; }; } // namespace notifier diff --git a/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h b/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h index 26921c2..374ddbe 100644 --- a/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h +++ b/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h @@ -17,7 +17,7 @@ class ChromeOmahaQueryParamsDelegate static ChromeOmahaQueryParamsDelegate* GetInstance(); // omaha_query_params::OmahaQueryParamsDelegate: - virtual std::string GetExtraParams() OVERRIDE; + virtual std::string GetExtraParams() override; // Returns the value we use for the "updaterchannel=" and "prodchannel=" // parameters. Possible return values include: "canary", "dev", "beta", and diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h index 9ce89a8..61f2644 100644 --- a/chrome/browser/password_manager/chrome_password_manager_client.h +++ b/chrome/browser/password_manager/chrome_password_manager_client.h @@ -40,33 +40,33 @@ class ChromePasswordManagerClient virtual ~ChromePasswordManagerClient(); // PasswordManagerClient implementation. - virtual bool IsAutomaticPasswordSavingEnabled() const OVERRIDE; - virtual bool IsPasswordManagerEnabledForCurrentPage() const OVERRIDE; + virtual bool IsAutomaticPasswordSavingEnabled() const override; + virtual bool IsPasswordManagerEnabledForCurrentPage() const override; virtual bool ShouldFilterAutofillResult( - const autofill::PasswordForm& form) OVERRIDE; + const autofill::PasswordForm& form) override; virtual bool IsSyncAccountCredential( - const std::string& username, const std::string& origin) const OVERRIDE; - virtual void AutofillResultsComputed() OVERRIDE; + const std::string& username, const std::string& origin) const override; + virtual void AutofillResultsComputed() override; virtual bool PromptUserToSavePassword( - scoped_ptr<password_manager::PasswordFormManager> form_to_save) OVERRIDE; + scoped_ptr<password_manager::PasswordFormManager> form_to_save) override; virtual void AutomaticPasswordSave( scoped_ptr<password_manager::PasswordFormManager> saved_form_manager) - OVERRIDE; + override; virtual void PasswordWasAutofilled( - const autofill::PasswordFormMap& best_matches) const OVERRIDE; + const autofill::PasswordFormMap& best_matches) const override; virtual void PasswordAutofillWasBlocked( - const autofill::PasswordFormMap& best_matches) const OVERRIDE; + const autofill::PasswordFormMap& best_matches) const override; virtual void AuthenticateAutofillAndFillForm( - scoped_ptr<autofill::PasswordFormFillData> fill_data) OVERRIDE; - virtual PrefService* GetPrefs() OVERRIDE; - virtual password_manager::PasswordStore* GetPasswordStore() OVERRIDE; - virtual password_manager::PasswordManagerDriver* GetDriver() OVERRIDE; + scoped_ptr<autofill::PasswordFormFillData> fill_data) override; + virtual PrefService* GetPrefs() override; + virtual password_manager::PasswordStore* GetPasswordStore() override; + virtual password_manager::PasswordManagerDriver* GetDriver() override; virtual base::FieldTrial::Probability GetProbabilityForExperiment( - const std::string& experiment_name) OVERRIDE; - virtual bool IsPasswordSyncEnabled() OVERRIDE; - virtual void OnLogRouterAvailabilityChanged(bool router_can_be_used) OVERRIDE; - virtual void LogSavePasswordProgress(const std::string& text) OVERRIDE; - virtual bool IsLoggingActive() const OVERRIDE; + const std::string& experiment_name) override; + virtual bool IsPasswordSyncEnabled() override; + virtual void OnLogRouterAvailabilityChanged(bool router_can_be_used) override; + virtual void LogSavePasswordProgress(const std::string& text) override; + virtual bool IsLoggingActive() const override; // Hides any visible generation UI. void HidePasswordGenerationPopup(); @@ -110,7 +110,7 @@ class ChromePasswordManagerClient friend class content::WebContentsUserData<ChromePasswordManagerClient>; // content::WebContentsObserver overrides. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // Callback method to be triggered when authentication is successful for a // given password authentication request. If authentication is disabled or diff --git a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc index a69ee78..a07ad6d 100644 --- a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc @@ -44,7 +44,7 @@ class TestChromePasswordManagerClient : public ChromePasswordManagerClient { virtual bool IsSyncAccountCredential( const std::string& username, - const std::string& origin) const OVERRIDE { + const std::string& origin) const override { return is_sync_account_credential_; } @@ -64,7 +64,7 @@ class ChromePasswordManagerClientTest : public ChromeRenderViewHostTestHarness { public: ChromePasswordManagerClientTest(); - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; protected: ChromePasswordManagerClient* GetClient(); diff --git a/chrome/browser/password_manager/native_backend_gnome_x.h b/chrome/browser/password_manager/native_backend_gnome_x.h index 601f589..34edd66 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x.h +++ b/chrome/browser/password_manager/native_backend_gnome_x.h @@ -88,27 +88,27 @@ class NativeBackendGnome : public PasswordStoreX::NativeBackend, virtual ~NativeBackendGnome(); - virtual bool Init() OVERRIDE; + virtual bool Init() override; // Implements NativeBackend interface. virtual password_manager::PasswordStoreChangeList AddLogin( - const autofill::PasswordForm& form) OVERRIDE; + const autofill::PasswordForm& form) override; virtual bool UpdateLogin( const autofill::PasswordForm& form, - password_manager::PasswordStoreChangeList* changes) OVERRIDE; - virtual bool RemoveLogin(const autofill::PasswordForm& form) OVERRIDE; + password_manager::PasswordStoreChangeList* changes) override; + virtual bool RemoveLogin(const autofill::PasswordForm& form) override; virtual bool RemoveLoginsCreatedBetween( base::Time delete_begin, base::Time delete_end, - password_manager::PasswordStoreChangeList* changes) OVERRIDE; + password_manager::PasswordStoreChangeList* changes) override; virtual bool RemoveLoginsSyncedBetween( base::Time delete_begin, base::Time delete_end, - password_manager::PasswordStoreChangeList* changes) OVERRIDE; + password_manager::PasswordStoreChangeList* changes) override; virtual bool GetLogins(const autofill::PasswordForm& form, - PasswordFormList* forms) OVERRIDE; - virtual bool GetAutofillableLogins(PasswordFormList* forms) OVERRIDE; - virtual bool GetBlacklistLogins(PasswordFormList* forms) OVERRIDE; + PasswordFormList* forms) override; + virtual bool GetAutofillableLogins(PasswordFormList* forms) override; + virtual bool GetBlacklistLogins(PasswordFormList* forms) override; private: enum TimestampToCompare { diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.h b/chrome/browser/password_manager/native_backend_kwallet_x.h index 26e2dfb..a809279 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x.h +++ b/chrome/browser/password_manager/native_backend_kwallet_x.h @@ -37,27 +37,27 @@ class NativeBackendKWallet : public PasswordStoreX::NativeBackend { virtual ~NativeBackendKWallet(); - virtual bool Init() OVERRIDE; + virtual bool Init() override; // Implements NativeBackend interface. virtual password_manager::PasswordStoreChangeList AddLogin( - const autofill::PasswordForm& form) OVERRIDE; + const autofill::PasswordForm& form) override; virtual bool UpdateLogin( const autofill::PasswordForm& form, - password_manager::PasswordStoreChangeList* changes) OVERRIDE; - virtual bool RemoveLogin(const autofill::PasswordForm& form) OVERRIDE; + password_manager::PasswordStoreChangeList* changes) override; + virtual bool RemoveLogin(const autofill::PasswordForm& form) override; virtual bool RemoveLoginsCreatedBetween( base::Time delete_begin, base::Time delete_end, - password_manager::PasswordStoreChangeList* changes) OVERRIDE; + password_manager::PasswordStoreChangeList* changes) override; virtual bool RemoveLoginsSyncedBetween( base::Time delete_begin, base::Time delete_end, - password_manager::PasswordStoreChangeList* changes) OVERRIDE; + password_manager::PasswordStoreChangeList* changes) override; virtual bool GetLogins(const autofill::PasswordForm& form, - PasswordFormList* forms) OVERRIDE; - virtual bool GetAutofillableLogins(PasswordFormList* forms) OVERRIDE; - virtual bool GetBlacklistLogins(PasswordFormList* forms) OVERRIDE; + PasswordFormList* forms) override; + virtual bool GetAutofillableLogins(PasswordFormList* forms) override; + virtual bool GetBlacklistLogins(PasswordFormList* forms) override; protected: // Invalid handle returned by WalletHandle(). diff --git a/chrome/browser/password_manager/password_generation_interactive_uitest.cc b/chrome/browser/password_manager/password_generation_interactive_uitest.cc index 686d1ad..97458e3 100644 --- a/chrome/browser/password_manager/password_generation_interactive_uitest.cc +++ b/chrome/browser/password_manager/password_generation_interactive_uitest.cc @@ -29,12 +29,12 @@ class TestPopupObserver : public autofill::PasswordGenerationPopupObserver { password_visible_(false) {} virtual ~TestPopupObserver() {} - virtual void OnPopupShown(bool password_visible) OVERRIDE { + virtual void OnPopupShown(bool password_visible) override { popup_showing_ = true; password_visible_ = password_visible; } - virtual void OnPopupHidden() OVERRIDE { + virtual void OnPopupHidden() override { popup_showing_ = false; } @@ -50,7 +50,7 @@ class TestPopupObserver : public autofill::PasswordGenerationPopupObserver { class PasswordGenerationInteractiveTest : public InProcessBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Make sure the feature is enabled. command_line->AppendSwitch(autofill::switches::kEnablePasswordGeneration); @@ -59,7 +59,7 @@ class PasswordGenerationInteractiveTest : public InProcessBrowserTest { autofill::switches::kLocalHeuristicsOnlyForPasswordGeneration); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { // Disable Autofill requesting access to AddressBook data. This will cause // the tests to hang on Mac. autofill::test::DisableSystemServices(browser()->profile()->GetPrefs()); @@ -74,7 +74,7 @@ class PasswordGenerationInteractiveTest : public InProcessBrowserTest { ui_test_utils::NavigateToURL(browser(), url); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { // Clean up UI. ChromePasswordManagerClient* client = ChromePasswordManagerClient::FromWebContents(GetWebContents()); diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc index 2edb3fd..a515b1d 100644 --- a/chrome/browser/password_manager/password_manager_browsertest.cc +++ b/chrome/browser/password_manager/password_manager_browsertest.cc @@ -78,7 +78,7 @@ class NavigationObserver : public content::WebContentsObserver { // content::WebContentsObserver: virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host, - const GURL& validated_url) OVERRIDE { + const GURL& validated_url) override { if (!wait_for_path_.empty()) { if (validated_url.path() == wait_for_path_) message_loop_runner_->Quit(); @@ -145,11 +145,11 @@ class InfoBarObserver : public PromptObserver, private: // PromptObserver: - virtual bool IsShowingPrompt() const OVERRIDE { + virtual bool IsShowingPrompt() const override { return infobar_is_being_shown_; } - virtual void AcceptImpl() const OVERRIDE { + virtual void AcceptImpl() const override { EXPECT_EQ(1u, infobar_service_->infobar_count()); if (!infobar_service_->infobar_count()) return; // Let the test finish to gather possibly more diagnostics. @@ -165,17 +165,17 @@ class InfoBarObserver : public PromptObserver, } // infobars::InfoBarManager::Observer: - virtual void OnInfoBarAdded(infobars::InfoBar* infobar) OVERRIDE { + virtual void OnInfoBarAdded(infobars::InfoBar* infobar) override { infobar_is_being_shown_ = true; } virtual void OnInfoBarRemoved(infobars::InfoBar* infobar, - bool animate) OVERRIDE { + bool animate) override { infobar_is_being_shown_ = false; } virtual void OnManagerShuttingDown( - infobars::InfoBarManager* manager) OVERRIDE { + infobars::InfoBarManager* manager) override { ASSERT_EQ(infobar_service_, manager); infobar_service_->RemoveObserver(this); infobar_service_ = NULL; @@ -197,11 +197,11 @@ class BubbleObserver : public PromptObserver { private: // PromptObserver: - virtual bool IsShowingPrompt() const OVERRIDE { + virtual bool IsShowingPrompt() const override { return ui_controller_->PasswordPendingUserDecision(); } - virtual void AcceptImpl() const OVERRIDE { + virtual void AcceptImpl() const override { ui_controller_->SavePassword(); EXPECT_FALSE(IsShowingPrompt()); } @@ -264,7 +264,7 @@ class PasswordManagerBrowserTest : public InProcessBrowserTest { virtual ~PasswordManagerBrowserTest() {} // InProcessBrowserTest: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { // Use TestPasswordStore to remove a possible race. Normally the // PasswordStore does its database manipulation on the DB thread, which // creates a possible race during navigation. Specifically the @@ -277,7 +277,7 @@ class PasswordManagerBrowserTest : public InProcessBrowserTest { password_manager::switches::kEnableAutomaticPasswordSaving)); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { ASSERT_TRUE(embedded_test_server()->ShutdownAndWaitUntilComplete()); } diff --git a/chrome/browser/password_manager/password_store_factory.h b/chrome/browser/password_manager/password_store_factory.h index 3a318a5..49be379 100644 --- a/chrome/browser/password_manager/password_store_factory.h +++ b/chrome/browser/password_manager/password_store_factory.h @@ -36,7 +36,7 @@ class PasswordStoreService : public KeyedService { scoped_refptr<password_manager::PasswordStore> GetPasswordStore(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; private: scoped_refptr<password_manager::PasswordStore> password_store_; @@ -65,12 +65,12 @@ class PasswordStoreFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual void RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) OVERRIDE; + user_prefs::PrefRegistrySyncable* registry) override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsNULLWhileTesting() const override; DISALLOW_COPY_AND_ASSIGN(PasswordStoreFactory); }; diff --git a/chrome/browser/password_manager/password_store_mac.h b/chrome/browser/password_manager/password_store_mac.h index d507d9b..0e1be3d 100644 --- a/chrome/browser/password_manager/password_store_mac.h +++ b/chrome/browser/password_manager/password_store_mac.h @@ -39,41 +39,41 @@ class PasswordStoreMac : public password_manager::PasswordStore { // Initializes |thread_|. virtual bool Init( const syncer::SyncableService::StartSyncFlare& flare, - const std::string& sync_username) OVERRIDE; + const std::string& sync_username) override; // Stops |thread_|. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; protected: virtual ~PasswordStoreMac(); virtual scoped_refptr<base::SingleThreadTaskRunner> - GetBackgroundTaskRunner() OVERRIDE; + GetBackgroundTaskRunner() override; private: - virtual void ReportMetricsImpl(const std::string& sync_username) OVERRIDE; + virtual void ReportMetricsImpl(const std::string& sync_username) override; virtual password_manager::PasswordStoreChangeList AddLoginImpl( - const autofill::PasswordForm& form) OVERRIDE; + const autofill::PasswordForm& form) override; virtual password_manager::PasswordStoreChangeList UpdateLoginImpl( - const autofill::PasswordForm& form) OVERRIDE; + const autofill::PasswordForm& form) override; virtual password_manager::PasswordStoreChangeList RemoveLoginImpl( - const autofill::PasswordForm& form) OVERRIDE; + const autofill::PasswordForm& form) override; virtual password_manager::PasswordStoreChangeList RemoveLoginsCreatedBetweenImpl(base::Time delete_begin, - base::Time delete_end) OVERRIDE; + base::Time delete_end) override; virtual password_manager::PasswordStoreChangeList RemoveLoginsSyncedBetweenImpl(base::Time delete_begin, - base::Time delete_end) OVERRIDE; + base::Time delete_end) override; virtual void GetLoginsImpl( const autofill::PasswordForm& form, AuthorizationPromptPolicy prompt_policy, - const ConsumerCallbackRunner& callback_runner) OVERRIDE; - virtual void GetAutofillableLoginsImpl(GetLoginsRequest* request) OVERRIDE; - virtual void GetBlacklistLoginsImpl(GetLoginsRequest* request) OVERRIDE; + const ConsumerCallbackRunner& callback_runner) override; + virtual void GetAutofillableLoginsImpl(GetLoginsRequest* request) override; + virtual void GetBlacklistLoginsImpl(GetLoginsRequest* request) override; virtual bool FillAutofillableLogins( - std::vector<autofill::PasswordForm*>* forms) OVERRIDE; + std::vector<autofill::PasswordForm*>* forms) override; virtual bool FillBlacklistLogins( - std::vector<autofill::PasswordForm*>* forms) OVERRIDE; + std::vector<autofill::PasswordForm*>* forms) override; // Adds the given form to the Keychain if it's something we want to store // there (i.e., not a blacklist entry). Returns true if the operation diff --git a/chrome/browser/password_manager/password_store_win.cc b/chrome/browser/password_manager/password_store_win.cc index 9079891..4d9d212 100644 --- a/chrome/browser/password_manager/password_store_win.cc +++ b/chrome/browser/password_manager/password_store_win.cc @@ -63,7 +63,7 @@ class PasswordStoreWin::DBHandler : public WebDataServiceConsumer { // WebDataServiceConsumer implementation. virtual void OnWebDataServiceRequestDone( PasswordWebDataService::Handle handle, - const WDTypedResult* result) OVERRIDE; + const WDTypedResult* result) override; scoped_refptr<PasswordWebDataService> web_data_service_; diff --git a/chrome/browser/password_manager/password_store_win.h b/chrome/browser/password_manager/password_store_win.h index f13f7e7..43715d3 100644 --- a/chrome/browser/password_manager/password_store_win.h +++ b/chrome/browser/password_manager/password_store_win.h @@ -30,7 +30,7 @@ class PasswordStoreWin : public password_manager::PasswordStoreDefault { PasswordWebDataService* web_data_service); // PasswordStore: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; private: class DBHandler; @@ -43,7 +43,7 @@ class PasswordStoreWin : public password_manager::PasswordStoreDefault { virtual void GetLoginsImpl( const autofill::PasswordForm& form, AuthorizationPromptPolicy prompt_policy, - const ConsumerCallbackRunner& callback_runner) OVERRIDE; + const ConsumerCallbackRunner& callback_runner) override; void GetIE7LoginIfNecessary( const autofill::PasswordForm& form, diff --git a/chrome/browser/password_manager/password_store_x.h b/chrome/browser/password_manager/password_store_x.h index 53b47f9..7990a77 100644 --- a/chrome/browser/password_manager/password_store_x.h +++ b/chrome/browser/password_manager/password_store_x.h @@ -79,27 +79,27 @@ class PasswordStoreX : public password_manager::PasswordStoreDefault { // Implements PasswordStore interface. virtual password_manager::PasswordStoreChangeList AddLoginImpl( - const autofill::PasswordForm& form) OVERRIDE; + const autofill::PasswordForm& form) override; virtual password_manager::PasswordStoreChangeList UpdateLoginImpl( - const autofill::PasswordForm& form) OVERRIDE; + const autofill::PasswordForm& form) override; virtual password_manager::PasswordStoreChangeList RemoveLoginImpl( - const autofill::PasswordForm& form) OVERRIDE; + const autofill::PasswordForm& form) override; virtual password_manager::PasswordStoreChangeList RemoveLoginsCreatedBetweenImpl(base::Time delete_begin, - base::Time delete_end) OVERRIDE; + base::Time delete_end) override; virtual password_manager::PasswordStoreChangeList RemoveLoginsSyncedBetweenImpl(base::Time delete_begin, - base::Time delete_end) OVERRIDE; + base::Time delete_end) override; virtual void GetLoginsImpl( const autofill::PasswordForm& form, AuthorizationPromptPolicy prompt_policy, - const ConsumerCallbackRunner& callback_runner) OVERRIDE; - virtual void GetAutofillableLoginsImpl(GetLoginsRequest* request) OVERRIDE; - virtual void GetBlacklistLoginsImpl(GetLoginsRequest* request) OVERRIDE; + const ConsumerCallbackRunner& callback_runner) override; + virtual void GetAutofillableLoginsImpl(GetLoginsRequest* request) override; + virtual void GetBlacklistLoginsImpl(GetLoginsRequest* request) override; virtual bool FillAutofillableLogins( - std::vector<autofill::PasswordForm*>* forms) OVERRIDE; + std::vector<autofill::PasswordForm*>* forms) override; virtual bool FillBlacklistLogins( - std::vector<autofill::PasswordForm*>* forms) OVERRIDE; + std::vector<autofill::PasswordForm*>* forms) override; // Sort logins by origin, like the ORDER BY clause in login_database.cc. void SortLoginsByOrigin(NativeBackend::PasswordFormList* list); diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index abbeddec..724ecb3 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -57,56 +57,56 @@ class MockPasswordStoreObserver class FailingBackend : public PasswordStoreX::NativeBackend { public: - virtual bool Init() OVERRIDE { return true; } + virtual bool Init() override { return true; } - virtual PasswordStoreChangeList AddLogin(const PasswordForm& form) OVERRIDE { + virtual PasswordStoreChangeList AddLogin(const PasswordForm& form) override { return PasswordStoreChangeList(); } virtual bool UpdateLogin(const PasswordForm& form, - PasswordStoreChangeList* changes) OVERRIDE { + PasswordStoreChangeList* changes) override { return false; } - virtual bool RemoveLogin(const PasswordForm& form) OVERRIDE { return false; } + virtual bool RemoveLogin(const PasswordForm& form) override { return false; } virtual bool RemoveLoginsCreatedBetween( base::Time delete_begin, base::Time delete_end, - password_manager::PasswordStoreChangeList* changes) OVERRIDE { + password_manager::PasswordStoreChangeList* changes) override { return false; } virtual bool RemoveLoginsSyncedBetween( base::Time delete_begin, base::Time delete_end, - password_manager::PasswordStoreChangeList* changes) OVERRIDE { + password_manager::PasswordStoreChangeList* changes) override { return false; } virtual bool GetLogins(const PasswordForm& form, - PasswordFormList* forms) OVERRIDE { + PasswordFormList* forms) override { return false; } - virtual bool GetAutofillableLogins(PasswordFormList* forms) OVERRIDE { + virtual bool GetAutofillableLogins(PasswordFormList* forms) override { return false; } - virtual bool GetBlacklistLogins(PasswordFormList* forms) OVERRIDE { + virtual bool GetBlacklistLogins(PasswordFormList* forms) override { return false; } }; class MockBackend : public PasswordStoreX::NativeBackend { public: - virtual bool Init() OVERRIDE { return true; } + virtual bool Init() override { return true; } - virtual PasswordStoreChangeList AddLogin(const PasswordForm& form) OVERRIDE { + virtual PasswordStoreChangeList AddLogin(const PasswordForm& form) override { all_forms_.push_back(form); PasswordStoreChange change(PasswordStoreChange::ADD, form); return PasswordStoreChangeList(1, change); } virtual bool UpdateLogin(const PasswordForm& form, - PasswordStoreChangeList* changes) OVERRIDE { + PasswordStoreChangeList* changes) override { for (size_t i = 0; i < all_forms_.size(); ++i) if (CompareForms(all_forms_[i], form, true)) { all_forms_[i] = form; @@ -116,7 +116,7 @@ class MockBackend : public PasswordStoreX::NativeBackend { return true; } - virtual bool RemoveLogin(const PasswordForm& form) OVERRIDE { + virtual bool RemoveLogin(const PasswordForm& form) override { for (size_t i = 0; i < all_forms_.size(); ++i) if (CompareForms(all_forms_[i], form, false)) erase(i--); @@ -126,7 +126,7 @@ class MockBackend : public PasswordStoreX::NativeBackend { virtual bool RemoveLoginsCreatedBetween( base::Time delete_begin, base::Time delete_end, - password_manager::PasswordStoreChangeList* changes) OVERRIDE { + password_manager::PasswordStoreChangeList* changes) override { for (size_t i = 0; i < all_forms_.size(); ++i) { if (delete_begin <= all_forms_[i].date_created && (delete_end.is_null() || all_forms_[i].date_created < delete_end)) @@ -138,7 +138,7 @@ class MockBackend : public PasswordStoreX::NativeBackend { virtual bool RemoveLoginsSyncedBetween( base::Time delete_begin, base::Time delete_end, - password_manager::PasswordStoreChangeList* changes) OVERRIDE { + password_manager::PasswordStoreChangeList* changes) override { DCHECK(changes); for (size_t i = 0; i < all_forms_.size(); ++i) { if (delete_begin <= all_forms_[i].date_synced && @@ -152,21 +152,21 @@ class MockBackend : public PasswordStoreX::NativeBackend { } virtual bool GetLogins(const PasswordForm& form, - PasswordFormList* forms) OVERRIDE { + PasswordFormList* forms) override { for (size_t i = 0; i < all_forms_.size(); ++i) if (all_forms_[i].signon_realm == form.signon_realm) forms->push_back(new PasswordForm(all_forms_[i])); return true; } - virtual bool GetAutofillableLogins(PasswordFormList* forms) OVERRIDE { + virtual bool GetAutofillableLogins(PasswordFormList* forms) override { for (size_t i = 0; i < all_forms_.size(); ++i) if (!all_forms_[i].blacklisted_by_user) forms->push_back(new PasswordForm(all_forms_[i])); return true; } - virtual bool GetBlacklistLogins(PasswordFormList* forms) OVERRIDE { + virtual bool GetBlacklistLogins(PasswordFormList* forms) override { for (size_t i = 0; i < all_forms_.size(); ++i) if (all_forms_[i].blacklisted_by_user) forms->push_back(new PasswordForm(all_forms_[i])); diff --git a/chrome/browser/password_manager/save_password_infobar_delegate.h b/chrome/browser/password_manager/save_password_infobar_delegate.h index 13964d4..1854a77 100644 --- a/chrome/browser/password_manager/save_password_infobar_delegate.h +++ b/chrome/browser/password_manager/save_password_infobar_delegate.h @@ -54,18 +54,18 @@ class SavePasswordInfoBarDelegate : public ConfirmInfoBarDelegate { scoped_ptr<SavePasswordInfoBarDelegate> delegate); // InfoBarDelegate - virtual bool ShouldExpire(const NavigationDetails& details) const OVERRIDE; + virtual bool ShouldExpire(const NavigationDetails& details) const override; // ConfirmInfoBarDelegate - virtual int GetIconID() const OVERRIDE; - virtual Type GetInfoBarType() const OVERRIDE; - virtual base::string16 GetMessageText() const OVERRIDE; - virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; - virtual bool Accept() OVERRIDE; - virtual bool Cancel() OVERRIDE; - virtual void InfoBarDismissed() OVERRIDE; - - virtual InfoBarAutomationType GetInfoBarAutomationType() const OVERRIDE; + virtual int GetIconID() const override; + virtual Type GetInfoBarType() const override; + virtual base::string16 GetMessageText() const override; + virtual base::string16 GetButtonLabel(InfoBarButton button) const override; + virtual bool Accept() override; + virtual bool Cancel() override; + virtual void InfoBarDismissed() override; + + virtual InfoBarAutomationType GetInfoBarAutomationType() const override; // The PasswordFormManager managing the form we're asking the user about, // and should update as per her decision. diff --git a/chrome/browser/pepper_broker_infobar_delegate.h b/chrome/browser/pepper_broker_infobar_delegate.h index a0c135b..4791c11 100644 --- a/chrome/browser/pepper_broker_infobar_delegate.h +++ b/chrome/browser/pepper_broker_infobar_delegate.h @@ -42,13 +42,13 @@ class PepperBrokerInfoBarDelegate : public ConfirmInfoBarDelegate { virtual ~PepperBrokerInfoBarDelegate(); // ConfirmInfoBarDelegate: - virtual int GetIconID() const OVERRIDE; - virtual base::string16 GetMessageText() const OVERRIDE; - virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; - virtual bool Accept() OVERRIDE; - virtual bool Cancel() OVERRIDE; - virtual base::string16 GetLinkText() const OVERRIDE; - virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE; + virtual int GetIconID() const override; + virtual base::string16 GetMessageText() const override; + virtual base::string16 GetButtonLabel(InfoBarButton button) const override; + virtual bool Accept() override; + virtual bool Cancel() override; + virtual base::string16 GetLinkText() const override; + virtual bool LinkClicked(WindowOpenDisposition disposition) override; void DispatchCallback(bool result); diff --git a/chrome/browser/pepper_flash_settings_manager.cc b/chrome/browser/pepper_flash_settings_manager.cc index 377e86a..74caec5 100644 --- a/chrome/browser/pepper_flash_settings_manager.cc +++ b/chrome/browser/pepper_flash_settings_manager.cc @@ -64,8 +64,8 @@ class PepperFlashSettingsManager::Core uint64 max_age); // IPC::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnChannelError() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnChannelError() override; private: friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>; diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.h b/chrome/browser/plugins/chrome_plugin_service_filter.h index 5c61581..c4eb2c8 100644 --- a/chrome/browser/plugins/chrome_plugin_service_filter.h +++ b/chrome/browser/plugins/chrome_plugin_service_filter.h @@ -77,13 +77,13 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter, const void* context, const GURL& url, const GURL& policy_url, - content::WebPluginInfo* plugin) OVERRIDE; + content::WebPluginInfo* plugin) override; // CanLoadPlugin always grants permission to the browser // (render_process_id == 0) virtual bool CanLoadPlugin( int render_process_id, - const base::FilePath& path) OVERRIDE; + const base::FilePath& path) override; private: friend struct DefaultSingletonTraits<ChromePluginServiceFilter>; @@ -111,7 +111,7 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter, // content::NotificationObserver implementation: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; ProcessDetails* GetOrRegisterProcess(int render_process_id); const ProcessDetails* GetProcess(int render_process_id) const; diff --git a/chrome/browser/plugins/plugin_info_message_filter.h b/chrome/browser/plugins/plugin_info_message_filter.h index cc577c6..2c8d919 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.h +++ b/chrome/browser/plugins/plugin_info_message_filter.h @@ -78,8 +78,8 @@ class PluginInfoMessageFilter : public content::BrowserMessageFilter { PluginInfoMessageFilter(int render_process_id, Profile* profile); // content::BrowserMessageFilter methods: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnDestruct() const OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnDestruct() const override; private: friend struct content::BrowserThread::DeleteOnThread< diff --git a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc index 3b612dc..e9c0b98 100644 --- a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc +++ b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc @@ -41,10 +41,10 @@ class FakePluginServiceFilter : public content::PluginServiceFilter { const void* context, const GURL& url, const GURL& policy_url, - content::WebPluginInfo* plugin) OVERRIDE; + content::WebPluginInfo* plugin) override; virtual bool CanLoadPlugin(int render_process_id, - const base::FilePath& path) OVERRIDE; + const base::FilePath& path) override; void set_plugin_enabled(const base::FilePath& plugin_path, bool enabled) { plugin_state_[plugin_path] = enabled; @@ -85,7 +85,7 @@ class PluginInfoMessageFilterTest : public ::testing::Test { context_(0, &profile_) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { content::WebPluginInfo foo_plugin(base::ASCIIToUTF16("Foo Plug-in"), foo_plugin_path_, base::ASCIIToUTF16("1"), diff --git a/chrome/browser/plugins/plugin_infobar_delegates.h b/chrome/browser/plugins/plugin_infobar_delegates.h index aa9e1fd..6e7a278 100644 --- a/chrome/browser/plugins/plugin_infobar_delegates.h +++ b/chrome/browser/plugins/plugin_infobar_delegates.h @@ -28,7 +28,7 @@ class PluginInfoBarDelegate : public ConfirmInfoBarDelegate { virtual ~PluginInfoBarDelegate(); // ConfirmInfoBarDelegate: - virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE; + virtual bool LinkClicked(WindowOpenDisposition disposition) override; virtual std::string GetLearnMoreURL() const = 0; @@ -36,8 +36,8 @@ class PluginInfoBarDelegate : public ConfirmInfoBarDelegate { private: // ConfirmInfoBarDelegate: - virtual int GetIconID() const OVERRIDE; - virtual base::string16 GetLinkText() const OVERRIDE; + virtual int GetIconID() const override; + virtual base::string16 GetLinkText() const override; std::string identifier_; @@ -61,13 +61,13 @@ class UnauthorizedPluginInfoBarDelegate : public PluginInfoBarDelegate { virtual ~UnauthorizedPluginInfoBarDelegate(); // PluginInfoBarDelegate: - virtual base::string16 GetMessageText() const OVERRIDE; - virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; - virtual bool Accept() OVERRIDE; - virtual bool Cancel() OVERRIDE; - virtual void InfoBarDismissed() OVERRIDE; - virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE; - virtual std::string GetLearnMoreURL() const OVERRIDE; + virtual base::string16 GetMessageText() const override; + virtual base::string16 GetButtonLabel(InfoBarButton button) const override; + virtual bool Accept() override; + virtual bool Cancel() override; + virtual void InfoBarDismissed() override; + virtual bool LinkClicked(WindowOpenDisposition disposition) override; + virtual std::string GetLearnMoreURL() const override; HostContentSettingsMap* content_settings_; base::string16 name_; @@ -93,22 +93,22 @@ class OutdatedPluginInfoBarDelegate : public PluginInfoBarDelegate, virtual ~OutdatedPluginInfoBarDelegate(); // PluginInfoBarDelegate: - virtual base::string16 GetMessageText() const OVERRIDE; - virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; - virtual bool Accept() OVERRIDE; - virtual bool Cancel() OVERRIDE; - virtual void InfoBarDismissed() OVERRIDE; - virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE; - virtual std::string GetLearnMoreURL() const OVERRIDE; + virtual base::string16 GetMessageText() const override; + virtual base::string16 GetButtonLabel(InfoBarButton button) const override; + virtual bool Accept() override; + virtual bool Cancel() override; + virtual void InfoBarDismissed() override; + virtual bool LinkClicked(WindowOpenDisposition disposition) override; + virtual std::string GetLearnMoreURL() const override; // PluginInstallerObserver: - virtual void DownloadStarted() OVERRIDE; - virtual void DownloadError(const std::string& message) OVERRIDE; - virtual void DownloadCancelled() OVERRIDE; - virtual void DownloadFinished() OVERRIDE; + virtual void DownloadStarted() override; + virtual void DownloadError(const std::string& message) override; + virtual void DownloadCancelled() override; + virtual void DownloadFinished() override; // WeakPluginInstallerObserver: - virtual void OnlyWeakObserversLeft() OVERRIDE; + virtual void OnlyWeakObserversLeft() override; // Replaces this infobar with one showing |message|. The new infobar will // not have any buttons (and not call the callback). @@ -154,22 +154,22 @@ class PluginInstallerInfoBarDelegate : public ConfirmInfoBarDelegate, virtual ~PluginInstallerInfoBarDelegate(); // ConfirmInfoBarDelegate: - virtual int GetIconID() const OVERRIDE; - virtual base::string16 GetMessageText() const OVERRIDE; - virtual int GetButtons() const OVERRIDE; - virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; - virtual bool Accept() OVERRIDE; - virtual base::string16 GetLinkText() const OVERRIDE; - virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE; + virtual int GetIconID() const override; + virtual base::string16 GetMessageText() const override; + virtual int GetButtons() const override; + virtual base::string16 GetButtonLabel(InfoBarButton button) const override; + virtual bool Accept() override; + virtual base::string16 GetLinkText() const override; + virtual bool LinkClicked(WindowOpenDisposition disposition) override; // PluginInstallerObserver: - virtual void DownloadStarted() OVERRIDE; - virtual void DownloadError(const std::string& message) OVERRIDE; - virtual void DownloadCancelled() OVERRIDE; - virtual void DownloadFinished() OVERRIDE; + virtual void DownloadStarted() override; + virtual void DownloadError(const std::string& message) override; + virtual void DownloadCancelled() override; + virtual void DownloadFinished() override; // WeakPluginInstallerObserver: - virtual void OnlyWeakObserversLeft() OVERRIDE; + virtual void OnlyWeakObserversLeft() override; // Replaces this infobar with one showing |message|. The new infobar will // not have any buttons (and not call the callback). @@ -210,13 +210,13 @@ class PluginMetroModeInfoBarDelegate : public ConfirmInfoBarDelegate { virtual ~PluginMetroModeInfoBarDelegate(); // ConfirmInfoBarDelegate: - virtual int GetIconID() const OVERRIDE; - virtual base::string16 GetMessageText() const OVERRIDE; - virtual int GetButtons() const OVERRIDE; - virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; - virtual bool Accept() OVERRIDE; - virtual base::string16 GetLinkText() const OVERRIDE; - virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE; + virtual int GetIconID() const override; + virtual base::string16 GetMessageText() const override; + virtual int GetButtons() const override; + virtual base::string16 GetButtonLabel(InfoBarButton button) const override; + virtual bool Accept() override; + virtual base::string16 GetLinkText() const override; + virtual bool LinkClicked(WindowOpenDisposition disposition) override; const Mode mode_; const base::string16 name_; diff --git a/chrome/browser/plugins/plugin_installer.h b/chrome/browser/plugins/plugin_installer.h index 81d3447b..06ffaf4 100644 --- a/chrome/browser/plugins/plugin_installer.h +++ b/chrome/browser/plugins/plugin_installer.h @@ -33,8 +33,8 @@ class PluginInstaller : public content::DownloadItem::Observer { PluginInstaller(); virtual ~PluginInstaller(); - 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; void AddObserver(PluginInstallerObserver* observer); void RemoveObserver(PluginInstallerObserver* observer); diff --git a/chrome/browser/plugins/plugin_installer_unittest.cc b/chrome/browser/plugins/plugin_installer_unittest.cc index 359378e..468a6f7 100644 --- a/chrome/browser/plugins/plugin_installer_unittest.cc +++ b/chrome/browser/plugins/plugin_installer_unittest.cc @@ -21,8 +21,8 @@ namespace { class PluginInstallerTest : public ChromeRenderViewHostTestHarness { public: PluginInstallerTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; PluginInstaller* installer() { return installer_.get(); } @@ -68,12 +68,12 @@ class TestPluginInstallerObserver : public PluginInstallerObserver { const std::string& download_error() const { return download_error_; } private: - virtual void DownloadStarted() OVERRIDE { download_started_ = true; } - virtual void DownloadFinished() OVERRIDE { download_finished_ = true; } - virtual void DownloadError(const std::string& message) OVERRIDE { + virtual void DownloadStarted() override { download_started_ = true; } + virtual void DownloadFinished() override { download_finished_ = true; } + virtual void DownloadError(const std::string& message) override { download_error_ = message; } - virtual void DownloadCancelled() OVERRIDE { download_cancelled_ = true; } + virtual void DownloadCancelled() override { download_cancelled_ = true; } bool download_started_; bool download_finished_; diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc index 5e49883bd..2572b29d 100644 --- a/chrome/browser/plugins/plugin_observer.cc +++ b/chrome/browser/plugins/plugin_observer.cc @@ -64,15 +64,15 @@ class ConfirmInstallDialogDelegate : public TabModalConfirmDialogDelegate, scoped_ptr<PluginMetadata> plugin_metadata); // TabModalConfirmDialogDelegate methods: - virtual base::string16 GetTitle() OVERRIDE; - virtual base::string16 GetDialogMessage() OVERRIDE; - virtual base::string16 GetAcceptButtonTitle() OVERRIDE; - virtual void OnAccepted() OVERRIDE; - virtual void OnCanceled() OVERRIDE; + virtual base::string16 GetTitle() override; + virtual base::string16 GetDialogMessage() override; + virtual base::string16 GetAcceptButtonTitle() override; + virtual void OnAccepted() override; + virtual void OnCanceled() override; // WeakPluginInstallerObserver methods: - virtual void DownloadStarted() OVERRIDE; - virtual void OnlyWeakObserversLeft() OVERRIDE; + virtual void DownloadStarted() override; + virtual void OnlyWeakObserversLeft() override; private: content::WebContents* web_contents_; @@ -134,11 +134,11 @@ class ReloadPluginInfoBarDelegate : public ConfirmInfoBarDelegate { virtual ~ReloadPluginInfoBarDelegate(); // ConfirmInfobarDelegate: - virtual int GetIconID() const OVERRIDE; - virtual base::string16 GetMessageText() const OVERRIDE; - virtual int GetButtons() const OVERRIDE; - virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; - virtual bool Accept() OVERRIDE; + virtual int GetIconID() const override; + virtual base::string16 GetMessageText() const override; + virtual int GetButtons() const override; + virtual base::string16 GetButtonLabel(InfoBarButton button) const override; + virtual bool Accept() override; content::NavigationController* controller_; base::string16 message_; @@ -214,19 +214,19 @@ class PluginObserver::PluginPlaceholderHost : public PluginInstallerObserver { } // PluginInstallerObserver methods: - virtual void DownloadStarted() OVERRIDE { + virtual void DownloadStarted() override { observer_->Send(new ChromeViewMsg_StartedDownloadingPlugin(routing_id_)); } - virtual void DownloadError(const std::string& msg) OVERRIDE { + virtual void DownloadError(const std::string& msg) override { observer_->Send(new ChromeViewMsg_ErrorDownloadingPlugin(routing_id_, msg)); } - virtual void DownloadCancelled() OVERRIDE { + virtual void DownloadCancelled() override { observer_->Send(new ChromeViewMsg_CancelledDownloadingPlugin(routing_id_)); } - virtual void DownloadFinished() OVERRIDE { + virtual void DownloadFinished() override { observer_->Send(new ChromeViewMsg_FinishedDownloadingPlugin(routing_id_)); } diff --git a/chrome/browser/plugins/plugin_observer.h b/chrome/browser/plugins/plugin_observer.h index 306dd1c..a0cab5b 100644 --- a/chrome/browser/plugins/plugin_observer.h +++ b/chrome/browser/plugins/plugin_observer.h @@ -38,13 +38,13 @@ class PluginObserver : public content::WebContentsObserver, // content::WebContentsObserver implementation. virtual void RenderFrameCreated( - content::RenderFrameHost* render_frame_host) OVERRIDE; + content::RenderFrameHost* render_frame_host) override; virtual void PluginCrashed(const base::FilePath& plugin_path, - base::ProcessId plugin_pid) OVERRIDE; + base::ProcessId plugin_pid) override; virtual bool OnMessageReceived( const IPC::Message& message, - content::RenderFrameHost* render_frame_host) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + content::RenderFrameHost* render_frame_host) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: explicit PluginObserver(content::WebContents* web_contents); diff --git a/chrome/browser/plugins/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h index 3e56f7e..95a8152 100644 --- a/chrome/browser/plugins/plugin_prefs.h +++ b/chrome/browser/plugins/plugin_prefs.h @@ -75,7 +75,7 @@ class PluginPrefs : public RefcountedBrowserContextKeyedService { void set_profile(Profile* profile) { profile_ = profile; } // RefCountedProfileKeyedBase method override. - virtual void ShutdownOnUIThread() OVERRIDE; + virtual void ShutdownOnUIThread() override; private: friend class base::RefCountedThreadSafe<PluginPrefs>; diff --git a/chrome/browser/plugins/plugin_prefs_factory.h b/chrome/browser/plugins/plugin_prefs_factory.h index 697ed47..ed09efa 100644 --- a/chrome/browser/plugins/plugin_prefs_factory.h +++ b/chrome/browser/plugins/plugin_prefs_factory.h @@ -31,15 +31,15 @@ class PluginPrefsFactory : public RefcountedBrowserContextKeyedServiceFactory { // RefcountedBrowserContextKeyedServiceFactory methods: virtual scoped_refptr<RefcountedBrowserContextKeyedService> - BuildServiceInstanceFor(content::BrowserContext* context) const OVERRIDE; + BuildServiceInstanceFor(content::BrowserContext* context) const override; // BrowserContextKeyedServiceFactory methods: virtual void RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) OVERRIDE; + user_prefs::PrefRegistrySyncable* registry) override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsNULLWhileTesting() const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; }; #endif // CHROME_BROWSER_PLUGINS_PLUGIN_PREFS_FACTORY_H_ diff --git a/chrome/browser/plugins/plugin_prefs_unittest.cc b/chrome/browser/plugins/plugin_prefs_unittest.cc index 8ee7aa9..217a4ae 100644 --- a/chrome/browser/plugins/plugin_prefs_unittest.cc +++ b/chrome/browser/plugins/plugin_prefs_unittest.cc @@ -58,7 +58,7 @@ void GotPlugins(const base::Closure& quit_closure, class PluginPrefsTest : public ::testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { plugin_prefs_ = new PluginPrefs(); } diff --git a/chrome/browser/plugins/plugin_status_pref_setter.h b/chrome/browser/plugins/plugin_status_pref_setter.h index 2899cd2..5f52e80 100644 --- a/chrome/browser/plugins/plugin_status_pref_setter.h +++ b/chrome/browser/plugins/plugin_status_pref_setter.h @@ -48,7 +48,7 @@ class PluginStatusPrefSetter : public content::NotificationObserver { // content::NotificationObserver methods: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: void StartUpdate(); diff --git a/chrome/browser/plugins/plugins_resource_service.h b/chrome/browser/plugins/plugins_resource_service.h index 5c59780..44f4982 100644 --- a/chrome/browser/plugins/plugins_resource_service.h +++ b/chrome/browser/plugins/plugins_resource_service.h @@ -24,7 +24,7 @@ class PluginsResourceService : public WebResourceService { virtual ~PluginsResourceService(); // WebResourceService override to process the parsed information. - virtual void Unpack(const base::DictionaryValue& parsed_json) OVERRIDE; + virtual void Unpack(const base::DictionaryValue& parsed_json) override; DISALLOW_COPY_AND_ASSIGN(PluginsResourceService); }; diff --git a/chrome/browser/policy/chrome_browser_policy_connector.h b/chrome/browser/policy/chrome_browser_policy_connector.h index 1e772e1..b0e3cce 100644 --- a/chrome/browser/policy/chrome_browser_policy_connector.h +++ b/chrome/browser/policy/chrome_browser_policy_connector.h @@ -35,7 +35,7 @@ class ChromeBrowserPolicyConnector : public BrowserPolicyConnector { virtual void Init( PrefService* local_state, - scoped_refptr<net::URLRequestContextGetter> request_context) OVERRIDE; + scoped_refptr<net::URLRequestContextGetter> request_context) override; private: ConfigurationPolicyProvider* CreatePlatformProvider(); diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc index 413a471..4ce44c6 100644 --- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc @@ -200,7 +200,7 @@ class CloudPolicyTest : public InProcessBrowserTest, CloudPolicyTest() {} virtual ~CloudPolicyTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); ASSERT_NO_FATAL_FAILURE(SetServerPolicy(GetEmptyPolicy())); @@ -216,7 +216,7 @@ class CloudPolicyTest : public InProcessBrowserTest, RegisterTestingFactory(BuildFakeProfileInvalidationProvider); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ASSERT_TRUE(PolicyServiceIsEmpty(g_browser_process->policy_service())) << "Pre-existing policies in this machine will make this test fail."; @@ -310,14 +310,14 @@ class CloudPolicyTest : public InProcessBrowserTest, virtual void OnPolicyUpdated(const PolicyNamespace& ns, const PolicyMap& previous, - const PolicyMap& current) OVERRIDE { + const PolicyMap& current) override { if (!on_policy_updated_.is_null()) { on_policy_updated_.Run(); on_policy_updated_.Reset(); } } - virtual void OnPolicyServiceInitialized(PolicyDomain domain) OVERRIDE {} + virtual void OnPolicyServiceInitialized(PolicyDomain domain) override {} base::ScopedTempDir temp_dir_; scoped_ptr<LocalPolicyTestServer> test_server_; diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.h b/chrome/browser/policy/cloud/cloud_policy_invalidator.h index d5a6ba7..eeb12b5 100644 --- a/chrome/browser/policy/cloud/cloud_policy_invalidator.h +++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.h @@ -96,19 +96,19 @@ class CloudPolicyInvalidator : public syncer::InvalidationHandler, // syncer::InvalidationHandler: 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; // CloudPolicyCore::Observer: - virtual void OnCoreConnected(CloudPolicyCore* core) OVERRIDE; - virtual void OnRefreshSchedulerStarted(CloudPolicyCore* core) OVERRIDE; - virtual void OnCoreDisconnecting(CloudPolicyCore* core) OVERRIDE; + virtual void OnCoreConnected(CloudPolicyCore* core) override; + virtual void OnRefreshSchedulerStarted(CloudPolicyCore* core) override; + virtual void OnCoreDisconnecting(CloudPolicyCore* core) override; // CloudPolicyStore::Observer: - virtual void OnStoreLoaded(CloudPolicyStore* store) OVERRIDE; - virtual void OnStoreError(CloudPolicyStore* store) OVERRIDE; + virtual void OnStoreLoaded(CloudPolicyStore* store) override; + virtual void OnStoreError(CloudPolicyStore* store) override; private: // Handle an invalidation to the policy. diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc index 5a55fd0..7472917 100644 --- a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc @@ -48,7 +48,7 @@ class CloudPolicyInvalidatorTest : public testing::Test { CloudPolicyInvalidatorTest(); - virtual void TearDown() OVERRIDE; + virtual void TearDown() override; // Starts the invalidator which will be tested. // |initialize| determines if the invalidator should be initialized. @@ -854,7 +854,7 @@ class CloudPolicyInvalidatorUserTypedTest virtual ~CloudPolicyInvalidatorUserTypedTest(); // CloudPolicyInvalidatorTest: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; // Get the current count for the given metric. base::HistogramBase::Count GetCount(MetricPolicyRefresh metric); @@ -862,7 +862,7 @@ class CloudPolicyInvalidatorUserTypedTest private: // CloudPolicyInvalidatorTest: - virtual em::DeviceRegisterRequest::Type GetPolicyType() const OVERRIDE; + virtual em::DeviceRegisterRequest::Type GetPolicyType() const override; // Get histogram samples for the given histogram. scoped_ptr<base::HistogramSamples> GetHistogramSamples( diff --git a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc index 80ed8ee..1796f54 100644 --- a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc @@ -49,13 +49,13 @@ class CloudPolicyManagerTest : public InProcessBrowserTest { CloudPolicyManagerTest() {} virtual ~CloudPolicyManagerTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { CommandLine* command_line = CommandLine::ForCurrentProcess(); command_line->AppendSwitchASCII(switches::kDeviceManagementUrl, "http://localhost"); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ASSERT_TRUE(PolicyServiceIsEmpty(g_browser_process->policy_service())) << "Pre-existing policies in this machine will make this test fail."; @@ -85,7 +85,7 @@ class CloudPolicyManagerTest : public InProcessBrowserTest { #endif } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { // Verify that all the expected requests were handled. EXPECT_EQ(0u, interceptor_->GetPendingSize()); diff --git a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc index 3848c31..ee5a06a9 100644 --- a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc @@ -105,7 +105,7 @@ class ComponentCloudPolicyTest : public ExtensionBrowserTest { ComponentCloudPolicyTest() {} virtual ~ComponentCloudPolicyTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionBrowserTest::SetUpCommandLine(command_line); #if defined(OS_CHROMEOS) // ExtensionBrowserTest sets the login users to a non-managed value; @@ -116,7 +116,7 @@ class ComponentCloudPolicyTest : public ExtensionBrowserTest { #endif } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { test_server_.RegisterClient(kDMToken, kDeviceID); EXPECT_TRUE(test_server_.UpdatePolicyData( dm_protocol::kChromeExtensionPolicyType, kTestExtension, kTestPolicy)); @@ -129,7 +129,7 @@ class ComponentCloudPolicyTest : public ExtensionBrowserTest { ExtensionBrowserTest::SetUpInProcessBrowserTestFixture(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ASSERT_TRUE(PolicyServiceIsEmpty(g_browser_process->policy_service())) << "Pre-existing policies in this machine will make this test fail."; diff --git a/chrome/browser/policy/cloud/device_management_service_browsertest.cc b/chrome/browser/policy/cloud/device_management_service_browsertest.cc index 1cf7a58..c757045 100644 --- a/chrome/browser/policy/cloud/device_management_service_browsertest.cc +++ b/chrome/browser/policy/cloud/device_management_service_browsertest.cc @@ -141,7 +141,7 @@ class DeviceManagementServiceIntegrationTest base::MessageLoop::current()->Run(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { std::string service_url((this->*(GetParam()))()); service_.reset(new DeviceManagementService( scoped_ptr<DeviceManagementService::Configuration>( @@ -149,7 +149,7 @@ class DeviceManagementServiceIntegrationTest service_->ScheduleInitialization(0); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { service_.reset(); test_server_.reset(); interceptor_.reset(); diff --git a/chrome/browser/policy/cloud/policy_header_service_factory.cc b/chrome/browser/policy/cloud/policy_header_service_factory.cc index 04bc9f5..6e75c13 100644 --- a/chrome/browser/policy/cloud/policy_header_service_factory.cc +++ b/chrome/browser/policy/cloud/policy_header_service_factory.cc @@ -36,7 +36,7 @@ class PolicyHeaderServiceWrapper : public KeyedService { return policy_header_service_.get(); } - virtual void Shutdown() OVERRIDE { + virtual void Shutdown() override { // Shutdown our core object so it can unregister any observers before the // services we depend on are shutdown. policy_header_service_.reset(); diff --git a/chrome/browser/policy/cloud/policy_header_service_factory.h b/chrome/browser/policy/cloud/policy_header_service_factory.h index 2a319ec..31e78b2 100644 --- a/chrome/browser/policy/cloud/policy_header_service_factory.h +++ b/chrome/browser/policy/cloud/policy_header_service_factory.h @@ -28,7 +28,7 @@ class PolicyHeaderServiceFactory : public BrowserContextKeyedServiceFactory { protected: // BrowserContextKeyedServiceFactory implementation. virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; private: friend struct DefaultSingletonTraits<PolicyHeaderServiceFactory>; diff --git a/chrome/browser/policy/cloud/test_request_interceptor.cc b/chrome/browser/policy/cloud/test_request_interceptor.cc index 5c98bd24..967e470 100644 --- a/chrome/browser/policy/cloud/test_request_interceptor.cc +++ b/chrome/browser/policy/cloud/test_request_interceptor.cc @@ -165,7 +165,7 @@ class TestRequestInterceptor::Delegate : public net::URLRequestInterceptor { // net::URLRequestInterceptor implementation: virtual net::URLRequestJob* MaybeInterceptRequest( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE; + net::NetworkDelegate* network_delegate) const override; void GetPendingSize(size_t* pending_size) const; void PushJobCallback(const JobCallback& callback); diff --git a/chrome/browser/policy/cloud/user_cloud_policy_invalidator.h b/chrome/browser/policy/cloud/user_cloud_policy_invalidator.h index f9bea6c..0e9d265 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_invalidator.h +++ b/chrome/browser/policy/cloud/user_cloud_policy_invalidator.h @@ -35,12 +35,12 @@ class UserCloudPolicyInvalidator : public CloudPolicyInvalidator, static enterprise_management::DeviceRegisterRequest::Type GetPolicyType(); // KeyedService: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // content::NotificationObserver implementation: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: // The profile associated with the invalidator. diff --git a/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h b/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h index 084945e..0d75410 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h +++ b/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h @@ -24,9 +24,9 @@ class UserCloudPolicyInvalidatorFactory // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - 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(UserCloudPolicyInvalidatorFactory); }; diff --git a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc index e0d180d..877b190 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc +++ b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc @@ -42,7 +42,7 @@ class UserCloudPolicyManagerFactory::ManagerWrapper : public KeyedService { } virtual ~ManagerWrapper() {} - virtual void Shutdown() OVERRIDE { + virtual void Shutdown() override { manager_->Shutdown(); } diff --git a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h index 1738373..9bda2ba 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h +++ b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h @@ -107,14 +107,14 @@ class UserCloudPolicyManagerFactory : public BrowserContextKeyedBaseFactory { // BrowserContextKeyedBaseFactory: virtual void BrowserContextShutdown( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; virtual void BrowserContextDestroyed( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; virtual void SetEmptyTestingFactory( - content::BrowserContext* context) OVERRIDE; - virtual bool HasTestingFactory(content::BrowserContext* context) OVERRIDE; - virtual void CreateServiceNow(content::BrowserContext* context) OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; + content::BrowserContext* context) override; + virtual bool HasTestingFactory(content::BrowserContext* context) override; + virtual void CreateServiceNow(content::BrowserContext* context) override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; typedef std::map<content::BrowserContext*, ManagerWrapper*> ManagerWrapperMap; diff --git a/chrome/browser/policy/cloud/user_policy_signin_service.h b/chrome/browser/policy/cloud/user_policy_signin_service.h index a28d9ae..6eb0428 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service.h +++ b/chrome/browser/policy/cloud/user_policy_signin_service.h @@ -52,22 +52,22 @@ class UserPolicySigninService : public UserPolicySigninServiceBase, const PolicyRegistrationCallback& callback); // OAuth2TokenService::Observer implementation: - virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE; + virtual void OnRefreshTokenAvailable(const std::string& account_id) override; // CloudPolicyService::Observer implementation: - virtual void OnInitializationCompleted(CloudPolicyService* service) OVERRIDE; + virtual void OnInitializationCompleted(CloudPolicyService* service) override; // KeyedService implementation: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; protected: // UserPolicySigninServiceBase implementation: virtual void InitializeUserCloudPolicyManager( const std::string& username, - scoped_ptr<CloudPolicyClient> client) OVERRIDE; + scoped_ptr<CloudPolicyClient> client) override; - virtual void PrepareForUserCloudPolicyManagerShutdown() OVERRIDE; - virtual void ShutdownUserCloudPolicyManager() OVERRIDE; + virtual void PrepareForUserCloudPolicyManagerShutdown() override; + virtual void ShutdownUserCloudPolicyManager() override; private: // Fetches an OAuth token to allow the cloud policy service to register with diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_base.h b/chrome/browser/policy/cloud/user_policy_signin_service_base.h index b2e11e6..3a56277 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_base.h +++ b/chrome/browser/policy/cloud/user_policy_signin_service_base.h @@ -84,23 +84,23 @@ class UserPolicySigninServiceBase : public KeyedService, // SigninManagerBase::Observer implementation: virtual void GoogleSignedOut(const std::string& account_id, - const std::string& username) OVERRIDE; + const std::string& username) override; // content::NotificationObserver implementation: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // CloudPolicyService::Observer implementation: - virtual void OnInitializationCompleted(CloudPolicyService* service) OVERRIDE; + virtual void OnInitializationCompleted(CloudPolicyService* service) override; // CloudPolicyClient::Observer implementation: - virtual void OnPolicyFetched(CloudPolicyClient* client) OVERRIDE; - virtual void OnRegistrationStateChanged(CloudPolicyClient* client) OVERRIDE; - virtual void OnClientError(CloudPolicyClient* client) OVERRIDE; + virtual void OnPolicyFetched(CloudPolicyClient* client) override; + virtual void OnRegistrationStateChanged(CloudPolicyClient* client) override; + virtual void OnClientError(CloudPolicyClient* client) override; // KeyedService implementation: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; void SetSystemRequestContext( scoped_refptr<net::URLRequestContextGetter> request_context); diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_factory.h b/chrome/browser/policy/cloud/user_policy_signin_service_factory.h index 9c7bd59..69a57e0c 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_factory.h +++ b/chrome/browser/policy/cloud/user_policy_signin_service_factory.h @@ -40,14 +40,14 @@ class UserPolicySigninServiceFactory protected: // BrowserContextKeyedServiceFactory implementation. virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; // Overridden to cause this object to be created when the profile is created. - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; + virtual bool ServiceIsCreatedWithBrowserContext() const override; // Register the preferences related to cloud-based user policy. virtual void RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) OVERRIDE; + user_prefs::PrefRegistrySyncable* registry) override; private: friend struct DefaultSingletonTraits<UserPolicySigninServiceFactory>; diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h b/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h index e0e8f80..1d39ec08 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h +++ b/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h @@ -74,14 +74,14 @@ class UserPolicySigninService : public UserPolicySigninServiceBase { PolicyRegistrationCallback callback); // KeyedService implementation: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // CloudPolicyService::Observer implementation: - virtual void OnInitializationCompleted(CloudPolicyService* service) OVERRIDE; + virtual void OnInitializationCompleted(CloudPolicyService* service) override; // Overridden from UserPolicySigninServiceBase to cancel the pending delayed // registration. - virtual void ShutdownUserCloudPolicyManager() OVERRIDE; + virtual void ShutdownUserCloudPolicyManager() override; // Registers for cloud policy for an already signed-in user. void RegisterCloudPolicyService(); diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc index 602b1d4..a07045a 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc @@ -143,7 +143,7 @@ class UserPolicySigninServiceTest : public testing::Test { ASSERT_TRUE(IsRequestActive()); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { UserPolicySigninServiceFactory::SetDeviceManagementServiceForTesting( &device_management_service_); @@ -196,7 +196,7 @@ class UserPolicySigninServiceTest : public testing::Test { Mock::VerifyAndClearExpectations(mock_store_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { UserPolicySigninServiceFactory::SetDeviceManagementServiceForTesting(NULL); UserCloudPolicyManagerFactory::GetInstance()->ClearTestingFactory(); // Free the profile before we clear out the browser prefs. @@ -376,7 +376,7 @@ class UserPolicySigninServiceTest : public testing::Test { class UserPolicySigninServiceSignedInTest : public UserPolicySigninServiceTest { public: - virtual void AddProfile() OVERRIDE { + virtual void AddProfile() override { // UserCloudPolicyManager should not be initialized. ASSERT_FALSE(manager_->core()->service()); diff --git a/chrome/browser/policy/device_management_service_configuration.h b/chrome/browser/policy/device_management_service_configuration.h index 75fbb5e..1d1e3aa 100644 --- a/chrome/browser/policy/device_management_service_configuration.h +++ b/chrome/browser/policy/device_management_service_configuration.h @@ -21,9 +21,9 @@ class DeviceManagementServiceConfiguration explicit DeviceManagementServiceConfiguration(const std::string& server_url); virtual ~DeviceManagementServiceConfiguration(); - virtual std::string GetServerUrl() OVERRIDE; - virtual std::string GetAgentParameter() OVERRIDE; - virtual std::string GetPlatformParameter() OVERRIDE; + virtual std::string GetServerUrl() override; + virtual std::string GetAgentParameter() override; + virtual std::string GetPlatformParameter() override; private: const std::string server_url_; diff --git a/chrome/browser/policy/file_selection_dialogs_policy_handler.h b/chrome/browser/policy/file_selection_dialogs_policy_handler.h index 9fad2ad..cbaaf10 100644 --- a/chrome/browser/policy/file_selection_dialogs_policy_handler.h +++ b/chrome/browser/policy/file_selection_dialogs_policy_handler.h @@ -19,7 +19,7 @@ class FileSelectionDialogsPolicyHandler : public TypeCheckingPolicyHandler { // ConfigurationPolicyHandler methods: virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: DISALLOW_COPY_AND_ASSIGN(FileSelectionDialogsPolicyHandler); diff --git a/chrome/browser/policy/javascript_policy_handler.h b/chrome/browser/policy/javascript_policy_handler.h index 68b2f4b..9c91976 100644 --- a/chrome/browser/policy/javascript_policy_handler.h +++ b/chrome/browser/policy/javascript_policy_handler.h @@ -22,9 +22,9 @@ class JavascriptPolicyHandler : public ConfigurationPolicyHandler { // ConfigurationPolicyHandler methods: virtual bool CheckPolicySettings(const PolicyMap& policies, - PolicyErrorMap* errors) OVERRIDE; + PolicyErrorMap* errors) override; virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: DISALLOW_COPY_AND_ASSIGN(JavascriptPolicyHandler); diff --git a/chrome/browser/policy/javascript_policy_handler_unittest.cc b/chrome/browser/policy/javascript_policy_handler_unittest.cc index ba76238..2d0c8df 100644 --- a/chrome/browser/policy/javascript_policy_handler_unittest.cc +++ b/chrome/browser/policy/javascript_policy_handler_unittest.cc @@ -14,7 +14,7 @@ namespace policy { class JavascriptPolicyHandlerTest : public ConfigurationPolicyPrefStoreTest { - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { handler_list_.AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( new JavascriptPolicyHandler)); } diff --git a/chrome/browser/policy/managed_bookmarks_policy_handler.h b/chrome/browser/policy/managed_bookmarks_policy_handler.h index 0a61cb4..c060174 100644 --- a/chrome/browser/policy/managed_bookmarks_policy_handler.h +++ b/chrome/browser/policy/managed_bookmarks_policy_handler.h @@ -21,7 +21,7 @@ class ManagedBookmarksPolicyHandler : public SchemaValidatingPolicyHandler { // ConfigurationPolicyHandler methods: virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: void FilterBookmarks(base::ListValue* bookmarks); diff --git a/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc b/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc index b8a2d69..4e67986 100644 --- a/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc +++ b/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc @@ -19,7 +19,7 @@ namespace policy { class ManagedBookmarksPolicyHandlerTest : public ConfigurationPolicyPrefStoreTest { - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { Schema chrome_schema = Schema::Wrap(GetChromeSchemaData()); handler_list_.AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( new ManagedBookmarksPolicyHandler(chrome_schema))); diff --git a/chrome/browser/policy/network_prediction_policy_handler.h b/chrome/browser/policy/network_prediction_policy_handler.h index 55fa32e..a485fab 100644 --- a/chrome/browser/policy/network_prediction_policy_handler.h +++ b/chrome/browser/policy/network_prediction_policy_handler.h @@ -22,9 +22,9 @@ class NetworkPredictionPolicyHandler : public ConfigurationPolicyHandler { // ConfigurationPolicyHandler methods: virtual bool CheckPolicySettings(const PolicyMap& policies, - PolicyErrorMap* errors) OVERRIDE; + PolicyErrorMap* errors) override; virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: DISALLOW_COPY_AND_ASSIGN(NetworkPredictionPolicyHandler); diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index c7502c7..e2cab92 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -489,7 +489,7 @@ class TestAudioObserver : public chromeos::CrasAudioHandler::AudioObserver { protected: // chromeos::CrasAudioHandler::AudioObserver overrides. - virtual void OnOutputMuteChanged() OVERRIDE { + virtual void OnOutputMuteChanged() override { ++output_mute_changed_count_; } @@ -512,9 +512,9 @@ class WebContentsLoadedOrDestroyedWatcher void Wait(); // Overridden WebContentsObserver methods. - virtual void WebContentsDestroyed() OVERRIDE; + virtual void WebContentsDestroyed() override; virtual void DidStopLoading( - content::RenderViewHost* render_view_host) OVERRIDE; + content::RenderViewHost* render_view_host) override; private: scoped_refptr<content::MessageLoopRunner> message_loop_runner_; @@ -553,7 +553,7 @@ class TestAddAppWindowObserver virtual ~TestAddAppWindowObserver(); // extensions::AppWindowRegistry::Observer: - virtual void OnAppWindowAdded(extensions::AppWindow* app_window) OVERRIDE; + virtual void OnAppWindowAdded(extensions::AppWindow* app_window) override; extensions::AppWindow* WaitForAppWindow(); @@ -595,19 +595,19 @@ class PolicyTest : public InProcessBrowserTest { PolicyTest() {} virtual ~PolicyTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test_extension_cache_.reset(new extensions::ExtensionCacheFake()); InProcessBrowserTest::SetUp(); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { CommandLine::ForCurrentProcess()->AppendSwitch("noerrdialogs"); EXPECT_CALL(provider_, IsInitializationComplete(_)) .WillRepeatedly(Return(true)); BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(chrome_browser_net::SetUrlRequestMocksEnabled, true)); @@ -643,7 +643,7 @@ class PolicyTest : public InProcessBrowserTest { public: virtual void OnScreenshotCompleted( ScreenshotTakerObserver::Result screenshot_result, - const base::FilePath& screenshot_path) OVERRIDE { + const base::FilePath& screenshot_path) override { BrowserThread::PostTaskAndReply(BrowserThread::IO, FROM_HERE, base::Bind(base::DoNothing), @@ -771,7 +771,7 @@ class LocalePolicyTest : public PolicyTest { LocalePolicyTest() {} virtual ~LocalePolicyTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { PolicyTest::SetUpInProcessBrowserTestFixture(); PolicyMap policies; policies.Set(key::kApplicationLocaleValue, @@ -2675,14 +2675,14 @@ class RestoreOnStartupPolicyTest virtual ~RestoreOnStartupPolicyTest() {} #if defined(OS_CHROMEOS) - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // TODO(nkostylev): Investigate if we can remove this switch. command_line->AppendSwitch(switches::kCreateBrowserOnStartupForTests); PolicyTest::SetUpCommandLine(command_line); } #endif - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { PolicyTest::SetUpInProcessBrowserTestFixture(); // Set early policies now, before the browser is created. (this->*(GetParam()))(); @@ -2698,7 +2698,7 @@ class RestoreOnStartupPolicyTest command_line->argv().begin())); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, @@ -2846,7 +2846,7 @@ class PolicyStatisticsCollectorTest : public PolicyTest { PolicyStatisticsCollectorTest() {} virtual ~PolicyStatisticsCollectorTest() {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { PolicyTest::SetUpInProcessBrowserTestFixture(); PolicyMap policies; policies.Set(key::kShowHomeButton, @@ -3136,7 +3136,7 @@ INSTANTIATE_TEST_CASE_P(MediaStreamDevicesControllerBrowserTestInstance, // started. class PolicyVariationsServiceTest : public PolicyTest { public: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { PolicyTest::SetUpInProcessBrowserTestFixture(); PolicyMap policies; policies.Set(key::kVariationsRestrictParameter, diff --git a/chrome/browser/policy/policy_prefs_browsertest.cc b/chrome/browser/policy/policy_prefs_browsertest.cc index 9e6ba22..b9ebde3 100644 --- a/chrome/browser/policy/policy_prefs_browsertest.cc +++ b/chrome/browser/policy/policy_prefs_browsertest.cc @@ -490,18 +490,18 @@ IN_PROC_BROWSER_TEST_F(PolicyPrefsTestCoverageTest, AllPoliciesHaveATestCase) { // Base class for tests that change policy. class PolicyPrefsTest : public InProcessBrowserTest { protected: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { EXPECT_CALL(provider_, IsInitializationComplete(_)) .WillRepeatedly(Return(true)); BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ui_test_utils::WaitForTemplateURLServiceToLoad( TemplateURLServiceFactory::GetForProfile(browser()->profile())); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { ClearProviderPolicy(); } diff --git a/chrome/browser/policy/profile_policy_connector.h b/chrome/browser/policy/profile_policy_connector.h index cc29d09..e32e2c1 100644 --- a/chrome/browser/policy/profile_policy_connector.h +++ b/chrome/browser/policy/profile_policy_connector.h @@ -40,7 +40,7 @@ class ProfilePolicyConnector : public KeyedService { void InitForTesting(scoped_ptr<PolicyService> service); // KeyedService: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // This is never NULL. PolicyService* policy_service() const { return policy_service_.get(); } diff --git a/chrome/browser/policy/profile_policy_connector_factory.h b/chrome/browser/policy/profile_policy_connector_factory.h index d733784..22569f4 100644 --- a/chrome/browser/policy/profile_policy_connector_factory.h +++ b/chrome/browser/policy/profile_policy_connector_factory.h @@ -77,13 +77,13 @@ class ProfilePolicyConnectorFactory : public BrowserContextKeyedBaseFactory { // BrowserContextKeyedBaseFactory: virtual void BrowserContextShutdown( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; virtual void BrowserContextDestroyed( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; virtual void SetEmptyTestingFactory( - content::BrowserContext* context) OVERRIDE; - virtual bool HasTestingFactory(content::BrowserContext* context) OVERRIDE; - virtual void CreateServiceNow(content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; + virtual bool HasTestingFactory(content::BrowserContext* context) override; + virtual void CreateServiceNow(content::BrowserContext* context) override; typedef std::map<Profile*, ProfilePolicyConnector*> ConnectorMap; ConnectorMap connectors_; diff --git a/chrome/browser/policy/profile_policy_connector_unittest.cc b/chrome/browser/policy/profile_policy_connector_unittest.cc index 0cce66f..b4423e3 100644 --- a/chrome/browser/policy/profile_policy_connector_unittest.cc +++ b/chrome/browser/policy/profile_policy_connector_unittest.cc @@ -32,7 +32,7 @@ class ProfilePolicyConnectorTest : public testing::Test { ProfilePolicyConnectorTest() {} virtual ~ProfilePolicyConnectorTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // This must be set up before the TestingBrowserProcess is created. BrowserPolicyConnector::SetPolicyProviderForTesting(&mock_provider_); diff --git a/chrome/browser/policy/schema_registry_service_factory.h b/chrome/browser/policy/schema_registry_service_factory.h index d67202c..a4be07d 100644 --- a/chrome/browser/policy/schema_registry_service_factory.h +++ b/chrome/browser/policy/schema_registry_service_factory.h @@ -60,13 +60,13 @@ class SchemaRegistryServiceFactory : public BrowserContextKeyedBaseFactory { // BrowserContextKeyedBaseFactory: virtual void BrowserContextShutdown( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; virtual void BrowserContextDestroyed( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; virtual void SetEmptyTestingFactory( - content::BrowserContext* context) OVERRIDE; - virtual bool HasTestingFactory(content::BrowserContext* context) OVERRIDE; - virtual void CreateServiceNow(content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; + virtual bool HasTestingFactory(content::BrowserContext* context) override; + virtual void CreateServiceNow(content::BrowserContext* context) override; typedef std::map<content::BrowserContext*, SchemaRegistryService*> RegistryMap; diff --git a/chrome/browser/policy/test/local_policy_test_server.h b/chrome/browser/policy/test/local_policy_test_server.h index dab529f..8e2838a 100644 --- a/chrome/browser/policy/test/local_policy_test_server.h +++ b/chrome/browser/policy/test/local_policy_test_server.h @@ -80,11 +80,11 @@ class LocalPolicyTestServer : public net::LocalTestServer { GURL GetServiceURL() const; // net::LocalTestServer: - virtual bool SetPythonPath() const OVERRIDE; + virtual bool SetPythonPath() const override; virtual bool GetTestServerPath( - base::FilePath* testserver_path) const OVERRIDE; + base::FilePath* testserver_path) const override; virtual bool GenerateAdditionalArguments( - base::DictionaryValue* arguments) const OVERRIDE; + base::DictionaryValue* arguments) const override; private: std::string GetSelector(const std::string& type, diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc index 5bfed61..3d521b6 100644 --- a/chrome/browser/policy/url_blacklist_manager_unittest.cc +++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc @@ -66,12 +66,12 @@ class TestingURLBlacklistManager : public URLBlacklistManager { } // URLBlacklistManager overrides: - virtual void SetBlacklist(scoped_ptr<URLBlacklist> blacklist) OVERRIDE { + virtual void SetBlacklist(scoped_ptr<URLBlacklist> blacklist) override { set_blacklist_called_ = true; URLBlacklistManager::SetBlacklist(blacklist.Pass()); } - virtual void Update() OVERRIDE { + virtual void Update() override { update_called_++; URLBlacklistManager::Update(); } @@ -90,14 +90,14 @@ class URLBlacklistManagerTest : public testing::Test { protected: URLBlacklistManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { pref_service_.registry()->RegisterListPref(policy_prefs::kUrlBlacklist); pref_service_.registry()->RegisterListPref(policy_prefs::kUrlWhitelist); blacklist_manager_.reset(new TestingURLBlacklistManager(&pref_service_)); loop_.RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (blacklist_manager_.get()) blacklist_manager_->ShutdownOnUIThread(); loop_.RunUntilIdle(); diff --git a/chrome/browser/power/process_power_collector.h b/chrome/browser/power/process_power_collector.h index b172a8f..2e348e9 100644 --- a/chrome/browser/power/process_power_collector.h +++ b/chrome/browser/power/process_power_collector.h @@ -96,7 +96,7 @@ class ProcessPowerCollector #if defined(OS_CHROMEOS) // PowerManagerClient::Observer implementation: virtual void PowerChanged( - const power_manager::PowerSupplyProperties& prop) OVERRIDE; + const power_manager::PowerSupplyProperties& prop) override; #endif // Begin periodically updating the power consumption numbers by profile. diff --git a/chrome/browser/power/process_power_collector_unittest.cc b/chrome/browser/power/process_power_collector_unittest.cc index 210341e..443ac69 100644 --- a/chrome/browser/power/process_power_collector_unittest.cc +++ b/chrome/browser/power/process_power_collector_unittest.cc @@ -37,7 +37,7 @@ class BrowserProcessPowerTest : public BrowserWithTestWindowTest { BrowserProcessPowerTest() {} virtual ~BrowserProcessPowerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { BrowserWithTestWindowTest::SetUp(); collector.reset(new ProcessPowerCollector); @@ -55,7 +55,7 @@ class BrowserProcessPowerTest : public BrowserWithTestWindowTest { ASSERT_TRUE(profile_manager_->SetUp()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { collector.reset(); BrowserWithTestWindowTest::TearDown(); } @@ -96,13 +96,13 @@ class TestAppWindowContents : public extensions::AppWindowContents { // apps: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 { return web_contents_.get(); } diff --git a/chrome/browser/precache/most_visited_urls_provider.h b/chrome/browser/precache/most_visited_urls_provider.h index f1cef72..68052d0 100644 --- a/chrome/browser/precache/most_visited_urls_provider.h +++ b/chrome/browser/precache/most_visited_urls_provider.h @@ -25,7 +25,7 @@ class MostVisitedURLsProvider : public URLListProvider { // Returns a list of the user's most visited URLs via a callback. May be // called from any thread. The callback may be run before the call to GetURLs // returns. - virtual void GetURLs(const GetURLsCallback& callback) OVERRIDE; + virtual void GetURLs(const GetURLsCallback& callback) override; private: scoped_refptr<history::TopSites> top_sites_; diff --git a/chrome/browser/predictors/autocomplete_action_predictor.h b/chrome/browser/predictors/autocomplete_action_predictor.h index c80eae6..5c799de 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor.h +++ b/chrome/browser/predictors/autocomplete_action_predictor.h @@ -156,7 +156,7 @@ class AutocompleteActionPredictor // NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // The first step in initializing the predictor is accessing the database and // building the local cache. This should be delayed until after critical DB diff --git a/chrome/browser/predictors/autocomplete_action_predictor_factory.h b/chrome/browser/predictors/autocomplete_action_predictor_factory.h index 64ed34d..fff6a22 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_factory.h +++ b/chrome/browser/predictors/autocomplete_action_predictor_factory.h @@ -33,9 +33,9 @@ class AutocompleteActionPredictorFactory // BrowserContextKeyedServiceFactory: virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; DISALLOW_COPY_AND_ASSIGN(AutocompleteActionPredictorFactory); }; diff --git a/chrome/browser/predictors/autocomplete_action_predictor_table.h b/chrome/browser/predictors/autocomplete_action_predictor_table.h index a87cb0e..0871da5 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_table.h +++ b/chrome/browser/predictors/autocomplete_action_predictor_table.h @@ -77,8 +77,8 @@ class AutocompleteActionPredictorTable : public PredictorTableBase { virtual ~AutocompleteActionPredictorTable(); // PredictorTableBase methods (DB thread). - virtual void CreateTableIfNonExistent() OVERRIDE; - virtual void LogDatabaseStats() OVERRIDE; + virtual void CreateTableIfNonExistent() override; + virtual void LogDatabaseStats() override; DISALLOW_COPY_AND_ASSIGN(AutocompleteActionPredictorTable); }; diff --git a/chrome/browser/predictors/logged_in_predictor_table.h b/chrome/browser/predictors/logged_in_predictor_table.h index 30d1495..1c263a9 100644 --- a/chrome/browser/predictors/logged_in_predictor_table.h +++ b/chrome/browser/predictors/logged_in_predictor_table.h @@ -52,8 +52,8 @@ class LoggedInPredictorTable : public PredictorTableBase { virtual ~LoggedInPredictorTable(); // PredictorTableBase methods. - virtual void CreateTableIfNonExistent() OVERRIDE; - virtual void LogDatabaseStats() OVERRIDE; + virtual void CreateTableIfNonExistent() override; + virtual void LogDatabaseStats() override; DISALLOW_COPY_AND_ASSIGN(LoggedInPredictorTable); }; diff --git a/chrome/browser/predictors/predictor_database.h b/chrome/browser/predictors/predictor_database.h index bc53a9a..7d65b02 100644 --- a/chrome/browser/predictors/predictor_database.h +++ b/chrome/browser/predictors/predictor_database.h @@ -35,7 +35,7 @@ class PredictorDatabase : public KeyedService { private: // KeyedService - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; scoped_refptr<PredictorDatabaseInternal> db_; diff --git a/chrome/browser/predictors/predictor_database_factory.h b/chrome/browser/predictors/predictor_database_factory.h index 9b1e792..f3a72bef6 100644 --- a/chrome/browser/predictors/predictor_database_factory.h +++ b/chrome/browser/predictors/predictor_database_factory.h @@ -31,7 +31,7 @@ class PredictorDatabaseFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; DISALLOW_COPY_AND_ASSIGN(PredictorDatabaseFactory); }; diff --git a/chrome/browser/predictors/resource_prefetch_predictor.cc b/chrome/browser/predictors/resource_prefetch_predictor.cc index d0b02a2..9633969 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor.cc @@ -118,14 +118,14 @@ class GetUrlVisitCountTask : public history::HistoryDBTask { } virtual bool RunOnDBThread(history::HistoryBackend* backend, - history::HistoryDatabase* db) OVERRIDE { + history::HistoryDatabase* db) override { history::URLRow url_row; if (db->GetRowForURL(navigation_id_.main_frame_url, &url_row)) visit_count_ = url_row.visit_count(); return true; } - virtual void DoneRunOnMainThread() OVERRIDE { + virtual void DoneRunOnMainThread() override { callback_.Run(visit_count_, navigation_id_, *requests_); } diff --git a/chrome/browser/predictors/resource_prefetch_predictor.h b/chrome/browser/predictors/resource_prefetch_predictor.h index e82384f..7a1166e 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor.h +++ b/chrome/browser/predictors/resource_prefetch_predictor.h @@ -183,13 +183,13 @@ class ResourcePrefetchPredictor // Returns true if the request (should have a response in it) is cacheable. static bool IsCacheable(const net::URLRequest* request); - // content::NotificationObserver methods OVERRIDE. + // content::NotificationObserver methods override. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; - // KeyedService methods OVERRIDE. - virtual void Shutdown() OVERRIDE; + // KeyedService methods override. + virtual void Shutdown() override; // Functions called on different network events pertaining to the loading of // main frame resource or sub resources. diff --git a/chrome/browser/predictors/resource_prefetch_predictor_factory.h b/chrome/browser/predictors/resource_prefetch_predictor_factory.h index 7c6f5e8..8dc5795 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_factory.h +++ b/chrome/browser/predictors/resource_prefetch_predictor_factory.h @@ -28,7 +28,7 @@ class ResourcePrefetchPredictorFactory // RefcountedBrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; DISALLOW_COPY_AND_ASSIGN(ResourcePrefetchPredictorFactory); }; diff --git a/chrome/browser/predictors/resource_prefetch_predictor_tab_helper.h b/chrome/browser/predictors/resource_prefetch_predictor_tab_helper.h index 4580bc8..e70c345 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_tab_helper.h +++ b/chrome/browser/predictors/resource_prefetch_predictor_tab_helper.h @@ -17,9 +17,9 @@ class ResourcePrefetchPredictorTabHelper virtual ~ResourcePrefetchPredictorTabHelper(); // content::WebContentsObserver implementation - virtual void DocumentOnLoadCompletedInMainFrame() OVERRIDE; + virtual void DocumentOnLoadCompletedInMainFrame() override; virtual void DidLoadResourceFromMemoryCache( - const content::LoadFromMemoryCacheDetails& details) OVERRIDE; + const content::LoadFromMemoryCacheDetails& details) override; private: explicit ResourcePrefetchPredictorTabHelper( diff --git a/chrome/browser/predictors/resource_prefetch_predictor_tables.h b/chrome/browser/predictors/resource_prefetch_predictor_tables.h index bd266a0..d455453 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_tables.h +++ b/chrome/browser/predictors/resource_prefetch_predictor_tables.h @@ -137,8 +137,8 @@ class ResourcePrefetchPredictorTables : public PredictorTableBase { bool StringsAreSmallerThanDBLimit(const PrefetchData& data) const; // PredictorTableBase methods. - virtual void CreateTableIfNonExistent() OVERRIDE; - virtual void LogDatabaseStats() OVERRIDE; + virtual void CreateTableIfNonExistent() override; + virtual void LogDatabaseStats() override; // Helpers to return Statements for cached Statements. The caller must take // ownership of the return Statements. diff --git a/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc b/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc index 63ed7c4..37fc6a1 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc @@ -21,8 +21,8 @@ class ResourcePrefetchPredictorTablesTest : public testing::Test { public: ResourcePrefetchPredictorTablesTest(); virtual ~ResourcePrefetchPredictorTablesTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; protected: void TestGetAllData(); @@ -76,7 +76,7 @@ class ResourcePrefetchPredictorTablesTest : public testing::Test { class ResourcePrefetchPredictorTablesReopenTest : public ResourcePrefetchPredictorTablesTest { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Write data to the table, and then reopen the db. ResourcePrefetchPredictorTablesTest::SetUp(); ResourcePrefetchPredictorTablesTest::TearDown(); diff --git a/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc b/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc index ed9df65..675f6dd 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc @@ -73,8 +73,8 @@ class ResourcePrefetchPredictorTest : public testing::Test { public: ResourcePrefetchPredictorTest(); virtual ~ResourcePrefetchPredictorTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; protected: void AddUrlToHistory(const std::string& url, int visit_count) { diff --git a/chrome/browser/predictors/resource_prefetcher.h b/chrome/browser/predictors/resource_prefetcher.h index 18b1bff..1774307 100644 --- a/chrome/browser/predictors/resource_prefetcher.h +++ b/chrome/browser/predictors/resource_prefetcher.h @@ -125,18 +125,18 @@ class ResourcePrefetcher : public net::URLRequest::Delegate { // net::URLRequest::Delegate methods. virtual void OnReceivedRedirect(net::URLRequest* request, const net::RedirectInfo& redirect_info, - bool* defer_redirect) OVERRIDE; + bool* defer_redirect) override; virtual void OnAuthRequired(net::URLRequest* request, - net::AuthChallengeInfo* auth_info) OVERRIDE; + net::AuthChallengeInfo* auth_info) override; virtual void OnCertificateRequested( net::URLRequest* request, - net::SSLCertRequestInfo* cert_request_info) OVERRIDE; + net::SSLCertRequestInfo* cert_request_info) override; virtual void OnSSLCertificateError(net::URLRequest* request, const net::SSLInfo& ssl_info, - bool fatal) OVERRIDE; - virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE; + bool fatal) override; + virtual void OnResponseStarted(net::URLRequest* request) override; virtual void OnReadCompleted(net::URLRequest* request, - int bytes_read) OVERRIDE; + int bytes_read) override; enum PrefetcherState { INITIALIZED = 0, // Prefetching hasn't started. diff --git a/chrome/browser/predictors/resource_prefetcher_manager.h b/chrome/browser/predictors/resource_prefetcher_manager.h index 91b23ed..1a6ff7b 100644 --- a/chrome/browser/predictors/resource_prefetcher_manager.h +++ b/chrome/browser/predictors/resource_prefetcher_manager.h @@ -56,8 +56,8 @@ class ResourcePrefetcherManager // ResourcePrefetcher::Delegate methods. virtual void ResourcePrefetcherFinished( ResourcePrefetcher* prefetcher, - ResourcePrefetcher::RequestVector* requests) OVERRIDE; - virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE; + ResourcePrefetcher::RequestVector* requests) override; + virtual net::URLRequestContext* GetURLRequestContext() override; private: friend class base::RefCountedThreadSafe<ResourcePrefetcherManager>; diff --git a/chrome/browser/predictors/resource_prefetcher_unittest.cc b/chrome/browser/predictors/resource_prefetcher_unittest.cc index d1e8979..ab3bebe 100644 --- a/chrome/browser/predictors/resource_prefetcher_unittest.cc +++ b/chrome/browser/predictors/resource_prefetcher_unittest.cc @@ -36,7 +36,7 @@ class TestResourcePrefetcher : public ResourcePrefetcher { MOCK_METHOD1(StartURLRequest, void(net::URLRequest* request)); - void ReadFullResponse(net::URLRequest* request) OVERRIDE { + void ReadFullResponse(net::URLRequest* request) override { FinishRequest(request, Request::PREFETCH_STATUS_FROM_CACHE); } @@ -53,7 +53,7 @@ class TestResourcePrefetcherDelegate : public ResourcePrefetcher::Delegate { loop->message_loop_proxy())) { } ~TestResourcePrefetcherDelegate() { } - virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE { + virtual net::URLRequestContext* GetURLRequestContext() override { return request_context_getter_->GetURLRequestContext(); } diff --git a/chrome/browser/pref_service_flags_storage.h b/chrome/browser/pref_service_flags_storage.h index 7710eb8..06dfaef 100644 --- a/chrome/browser/pref_service_flags_storage.h +++ b/chrome/browser/pref_service_flags_storage.h @@ -19,8 +19,8 @@ class PrefServiceFlagsStorage : public FlagsStorage { explicit PrefServiceFlagsStorage(PrefService *prefs); virtual ~PrefServiceFlagsStorage(); - virtual std::set<std::string> GetFlags() OVERRIDE; - virtual bool SetFlags(const std::set<std::string>& flags) OVERRIDE; + virtual std::set<std::string> GetFlags() override; + virtual bool SetFlags(const std::set<std::string>& flags) override; private: PrefService* prefs_; diff --git a/chrome/browser/prefetch/prefetch_browsertest.cc b/chrome/browser/prefetch/prefetch_browsertest.cc index 0f371fc..ffe6ca6 100644 --- a/chrome/browser/prefetch/prefetch_browsertest.cc +++ b/chrome/browser/prefetch/prefetch_browsertest.cc @@ -32,14 +32,14 @@ const char kPrefetchPage[] = "files/prerender/simple_prefetch.html"; class MockNetworkChangeNotifierWIFI : public NetworkChangeNotifier { public: - virtual ConnectionType GetCurrentConnectionType() const OVERRIDE { + virtual ConnectionType GetCurrentConnectionType() const override { return NetworkChangeNotifier::CONNECTION_WIFI; } }; class MockNetworkChangeNotifier4G : public NetworkChangeNotifier { public: - virtual ConnectionType GetCurrentConnectionType() const OVERRIDE { + virtual ConnectionType GetCurrentConnectionType() const override { return NetworkChangeNotifier::CONNECTION_4G; } }; @@ -49,7 +49,7 @@ class PrefetchBrowserTestBase : public InProcessBrowserTest { explicit PrefetchBrowserTestBase(bool disabled_via_field_trial) : disabled_via_field_trial_(disabled_via_field_trial) {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { if (disabled_via_field_trial_) { command_line->AppendSwitchASCII(switches::kForceFieldTrials, "Prefetch/ExperimentDisabled/"); @@ -95,7 +95,7 @@ class HangingURLRequestJob : public net::URLRequestJob { : net::URLRequestJob(request, network_delegate) {} // net::URLRequestJob implementation - virtual void Start() OVERRIDE {} + virtual void Start() override {} private: virtual ~HangingURLRequestJob() {} @@ -112,7 +112,7 @@ class HangingRequestInterceptor : public net::URLRequestInterceptor { virtual net::URLRequestJob* MaybeInterceptRequest( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { if (!callback_.is_null()) BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback_); return new HangingURLRequestJob(request, network_delegate); diff --git a/chrome/browser/prefs/browser_ui_prefs_migrator.h b/chrome/browser/prefs/browser_ui_prefs_migrator.h index 7a91823..9c8aec3 100644 --- a/chrome/browser/prefs/browser_ui_prefs_migrator.h +++ b/chrome/browser/prefs/browser_ui_prefs_migrator.h @@ -24,8 +24,8 @@ class BrowserUIPrefsMigrator : public PrefStore::Observer { explicit BrowserUIPrefsMigrator(WriteablePrefStore* pref_store); // Overrides from PrefStore::Observer. - virtual void OnPrefValueChanged(const std::string& key) OVERRIDE {} - virtual void OnInitializationCompleted(bool succeeded) OVERRIDE; + virtual void OnPrefValueChanged(const std::string& key) override {} + virtual void OnInitializationCompleted(bool succeeded) override; private: friend struct base::DefaultDeleter<BrowserUIPrefsMigrator>; diff --git a/chrome/browser/prefs/browser_ui_prefs_migrator_unittest.cc b/chrome/browser/prefs/browser_ui_prefs_migrator_unittest.cc index c166649..811235a 100644 --- a/chrome/browser/prefs/browser_ui_prefs_migrator_unittest.cc +++ b/chrome/browser/prefs/browser_ui_prefs_migrator_unittest.cc @@ -17,40 +17,40 @@ class DictionaryPrefStore : public WriteablePrefStore { DictionaryPrefStore() : WriteablePrefStore() {} // Overrides from PrefStore. - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { observers_.AddObserver(observer); } - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { observers_.RemoveObserver(observer); } virtual bool GetValue(const std::string& key, - const base::Value** result) const OVERRIDE { + const base::Value** result) const override { return prefs_.Get(key, result); } // Overrides from WriteablePrefStore. - virtual void SetValue(const std::string& key, base::Value* value) OVERRIDE { + virtual void SetValue(const std::string& key, base::Value* value) override { DCHECK(value); prefs_.Set(key, value); ReportValueChanged(key); } - virtual void RemoveValue(const std::string& key) OVERRIDE { + virtual void RemoveValue(const std::string& key) override { if (prefs_.RemovePath(key, NULL)) ReportValueChanged(key); } virtual bool GetMutableValue(const std::string& key, - base::Value** result) OVERRIDE { + base::Value** result) override { return prefs_.Get(key, result); } - virtual void ReportValueChanged(const std::string& key) OVERRIDE {} + virtual void ReportValueChanged(const std::string& key) override {} virtual void SetValueSilently(const std::string& key, - base::Value* value) OVERRIDE { + base::Value* value) override { NOTIMPLEMENTED(); } diff --git a/chrome/browser/prefs/leveldb_pref_store.h b/chrome/browser/prefs/leveldb_pref_store.h index 1eb37f3..0f74127 100644 --- a/chrome/browser/prefs/leveldb_pref_store.h +++ b/chrome/browser/prefs/leveldb_pref_store.h @@ -38,26 +38,26 @@ class LevelDBPrefStore : public PersistentPrefStore { // PrefStore overrides: virtual bool GetValue(const std::string& key, - const base::Value** result) const OVERRIDE; - virtual void AddObserver(PrefStore::Observer* observer) OVERRIDE; - virtual void RemoveObserver(PrefStore::Observer* observer) OVERRIDE; - virtual bool HasObservers() const OVERRIDE; - virtual bool IsInitializationComplete() const OVERRIDE; + const base::Value** result) const override; + virtual void AddObserver(PrefStore::Observer* observer) override; + virtual void RemoveObserver(PrefStore::Observer* observer) override; + virtual bool HasObservers() const override; + virtual bool IsInitializationComplete() const override; // PersistentPrefStore overrides: virtual bool GetMutableValue(const std::string& key, - base::Value** result) OVERRIDE; + base::Value** result) override; // Takes ownership of value. - virtual void SetValue(const std::string& key, base::Value* value) OVERRIDE; + virtual void SetValue(const std::string& key, base::Value* value) override; virtual void SetValueSilently(const std::string& key, - base::Value* value) OVERRIDE; - virtual void RemoveValue(const std::string& key) OVERRIDE; - virtual bool ReadOnly() const OVERRIDE; - virtual PrefReadError GetReadError() const OVERRIDE; - virtual PrefReadError ReadPrefs() OVERRIDE; - virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) OVERRIDE; - virtual void CommitPendingWrite() OVERRIDE; - virtual void ReportValueChanged(const std::string& key) OVERRIDE; + base::Value* value) override; + virtual void RemoveValue(const std::string& key) override; + virtual bool ReadOnly() const override; + virtual PrefReadError GetReadError() const override; + virtual PrefReadError ReadPrefs() override; + virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) override; + virtual void CommitPendingWrite() override; + virtual void ReportValueChanged(const std::string& key) override; private: struct ReadingResults; diff --git a/chrome/browser/prefs/leveldb_pref_store_unittest.cc b/chrome/browser/prefs/leveldb_pref_store_unittest.cc index fe9baeb..e29df52 100644 --- a/chrome/browser/prefs/leveldb_pref_store_unittest.cc +++ b/chrome/browser/prefs/leveldb_pref_store_unittest.cc @@ -32,7 +32,7 @@ class MockReadErrorDelegate : public PersistentPrefStore::ReadErrorDelegate { class LevelDBPrefStoreTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_dir_)); @@ -40,7 +40,7 @@ class LevelDBPrefStoreTest : public testing::Test { ASSERT_TRUE(PathExists(data_dir_)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { Close(); } diff --git a/chrome/browser/prefs/pref_metrics_service.h b/chrome/browser/prefs/pref_metrics_service.h index 5fb9c2e..2b6c67e 100644 --- a/chrome/browser/prefs/pref_metrics_service.h +++ b/chrome/browser/prefs/pref_metrics_service.h @@ -37,11 +37,11 @@ class PrefMetricsService : public KeyedService { // BrowserContextKeyedServiceFactory implementation virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* profile) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; }; private: diff --git a/chrome/browser/prefs/pref_model_associator.h b/chrome/browser/prefs/pref_model_associator.h index 049b5c3..2c20f04 100644 --- a/chrome/browser/prefs/pref_model_associator.h +++ b/chrome/browser/prefs/pref_model_associator.h @@ -45,16 +45,16 @@ class PrefModelAssociator // syncer::SyncableService implementation. 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; 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; - virtual void StopSyncing(syncer::ModelType type) OVERRIDE; + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) override; + virtual void StopSyncing(syncer::ModelType type) override; // Returns the list of preference names that are registered as syncable, and // hence should be monitored for changes. diff --git a/chrome/browser/prefs/pref_service_browsertest.cc b/chrome/browser/prefs/pref_service_browsertest.cc index 496af81..72be947 100644 --- a/chrome/browser/prefs/pref_service_browsertest.cc +++ b/chrome/browser/prefs/pref_service_browsertest.cc @@ -54,7 +54,7 @@ class PreferenceServiceTest : public InProcessBrowserTest { explicit PreferenceServiceTest(bool new_profile) : new_profile_(new_profile) { } - virtual bool SetUpUserDataDirectory() OVERRIDE { + virtual bool SetUpUserDataDirectory() override { base::FilePath user_data_directory; PathService::Get(chrome::DIR_USER_DATA, &user_data_directory); diff --git a/chrome/browser/prefs/pref_service_syncable.h b/chrome/browser/prefs/pref_service_syncable.h index eb97a0a..fd799b3 100644 --- a/chrome/browser/prefs/pref_service_syncable.h +++ b/chrome/browser/prefs/pref_service_syncable.h @@ -79,7 +79,7 @@ class PrefServiceSyncable : public PrefService { syncer::SyncableService* GetSyncableService(const syncer::ModelType& type); // Do not call this after having derived an incognito or per tab pref service. - virtual void UpdateCommandLinePrefStore(PrefStore* cmd_line_store) OVERRIDE; + virtual void UpdateCommandLinePrefStore(PrefStore* cmd_line_store) override; void AddSyncedPrefObserver(const std::string& name, SyncedPrefObserver* observer); diff --git a/chrome/browser/prefs/prefs_syncable_service_unittest.cc b/chrome/browser/prefs/prefs_syncable_service_unittest.cc index 0337853..2f20316 100644 --- a/chrome/browser/prefs/prefs_syncable_service_unittest.cc +++ b/chrome/browser/prefs/prefs_syncable_service_unittest.cc @@ -42,7 +42,7 @@ class TestSyncProcessorStub : public syncer::SyncChangeProcessor { : output_(output), fail_next_(false) {} virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const syncer::SyncChangeList& change_list) OVERRIDE { + const syncer::SyncChangeList& change_list) override { if (output_) output_->insert(output_->end(), change_list.begin(), change_list.end()); if (fail_next_) { @@ -59,7 +59,7 @@ class TestSyncProcessorStub : public syncer::SyncChangeProcessor { } virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) - const OVERRIDE { + const override { return syncer::SyncDataList(); } private: diff --git a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc index 8910ca6..a552d86 100644 --- a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc +++ b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc @@ -51,7 +51,7 @@ class RegistryVerifier : public PrefStore::Observer { : pref_registry_(pref_registry) {} // PrefStore::Observer implementation - virtual void OnPrefValueChanged(const std::string& key) OVERRIDE { + virtual void OnPrefValueChanged(const std::string& key) override { EXPECT_TRUE(pref_registry_->end() != std::find_if(pref_registry_->begin(), pref_registry_->end(), @@ -59,7 +59,7 @@ class RegistryVerifier : public PrefStore::Observer { << "Unregistered key " << key << " was changed."; } - virtual void OnInitializationCompleted(bool succeeded) OVERRIDE {} + virtual void OnInitializationCompleted(bool succeeded) override {} private: scoped_refptr<PrefRegistry> pref_registry_; @@ -95,7 +95,7 @@ class ProfilePrefStoreManagerTest : public testing::Test { seed_("seed"), reset_recorded_(false) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ProfilePrefStoreManager::RegisterPrefs(local_state_.registry()); ProfilePrefStoreManager::RegisterProfilePrefs(profile_pref_registry_.get()); for (const PrefHashFilter::TrackedPreferenceMetadata* it = kConfiguration; @@ -140,7 +140,7 @@ class ProfilePrefStoreManagerTest : public testing::Test { &local_state_)); } - virtual void TearDown() OVERRIDE { DestroyPrefStore(); } + virtual void TearDown() override { DestroyPrefStore(); } protected: // Verifies whether a reset was reported via the RecordReset() hook. Also diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc index 17bb21b..0d64541 100644 --- a/chrome/browser/prefs/proxy_policy_unittest.cc +++ b/chrome/browser/prefs/proxy_policy_unittest.cc @@ -84,7 +84,7 @@ class ProxyPolicyTest : public testing::Test { ProxyPolicyTest() : command_line_(CommandLine::NO_PROGRAM) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EXPECT_CALL(provider_, IsInitializationComplete(_)) .WillRepeatedly(Return(true)); @@ -94,7 +94,7 @@ class ProxyPolicyTest : public testing::Test { provider_.Init(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { provider_.Shutdown(); } diff --git a/chrome/browser/prefs/synced_pref_change_registrar.h b/chrome/browser/prefs/synced_pref_change_registrar.h index 7cadd0a..8acc1e7 100644 --- a/chrome/browser/prefs/synced_pref_change_registrar.h +++ b/chrome/browser/prefs/synced_pref_change_registrar.h @@ -44,7 +44,7 @@ class SyncedPrefChangeRegistrar : public SyncedPrefObserver { private: // SyncedPrefObserver implementation virtual void OnSyncedPrefChanged(const std::string& path, bool from_sync) - OVERRIDE; + override; typedef std::map<std::string, NamedChangeCallback> ObserverMap; diff --git a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc index a211171..939aff4 100644 --- a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc +++ b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc @@ -94,7 +94,7 @@ class SyncedPrefChangeRegistrarTest : public InProcessBrowserTest { private: #if defined(ENABLE_CONFIGURATION_POLICY) - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { EXPECT_CALL(policy_provider_, IsInitializationComplete(_)) .WillRepeatedly(Return(true)); policy::BrowserPolicyConnector::SetPolicyProviderForTesting( @@ -102,7 +102,7 @@ class SyncedPrefChangeRegistrarTest : public InProcessBrowserTest { } #endif - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { prefs_ = PrefServiceSyncable::FromProfile(browser()->profile()); syncer_ = prefs_->GetSyncableService(syncer::PREFERENCES); syncer_->MergeDataAndStartSyncing( @@ -114,7 +114,7 @@ class SyncedPrefChangeRegistrarTest : public InProcessBrowserTest { registrar_.reset(new SyncedPrefChangeRegistrar(prefs_)); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { registrar_.reset(); } diff --git a/chrome/browser/prefs/tracked/dictionary_hash_store_contents.cc b/chrome/browser/prefs/tracked/dictionary_hash_store_contents.cc index e05f42d..50cc479 100644 --- a/chrome/browser/prefs/tracked/dictionary_hash_store_contents.cc +++ b/chrome/browser/prefs/tracked/dictionary_hash_store_contents.cc @@ -21,7 +21,7 @@ class MutablePreferenceMacDictionary explicit MutablePreferenceMacDictionary(base::DictionaryValue* storage); // MutableDictionary implementation - virtual base::DictionaryValue* operator->() OVERRIDE; + virtual base::DictionaryValue* operator->() override; private: base::DictionaryValue* storage_; diff --git a/chrome/browser/prefs/tracked/dictionary_hash_store_contents.h b/chrome/browser/prefs/tracked/dictionary_hash_store_contents.h index abba15d..f3317c8 100644 --- a/chrome/browser/prefs/tracked/dictionary_hash_store_contents.h +++ b/chrome/browser/prefs/tracked/dictionary_hash_store_contents.h @@ -31,13 +31,13 @@ class DictionaryHashStoreContents : public HashStoreContents { static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); // HashStoreContents implementation - virtual std::string hash_store_id() const OVERRIDE; - virtual void Reset() OVERRIDE; - virtual bool IsInitialized() const OVERRIDE; - virtual const base::DictionaryValue* GetContents() const OVERRIDE; - virtual scoped_ptr<MutableDictionary> GetMutableContents() OVERRIDE; - virtual std::string GetSuperMac() const OVERRIDE; - virtual void SetSuperMac(const std::string& super_mac) OVERRIDE; + virtual std::string hash_store_id() const override; + virtual void Reset() override; + virtual bool IsInitialized() const override; + virtual const base::DictionaryValue* GetContents() const override; + virtual scoped_ptr<MutableDictionary> GetMutableContents() override; + virtual std::string GetSuperMac() const override; + virtual void SetSuperMac(const std::string& super_mac) override; private: base::DictionaryValue* storage_; diff --git a/chrome/browser/prefs/tracked/interceptable_pref_filter.h b/chrome/browser/prefs/tracked/interceptable_pref_filter.h index 2760e36..3a70ab3 100644 --- a/chrome/browser/prefs/tracked/interceptable_pref_filter.h +++ b/chrome/browser/prefs/tracked/interceptable_pref_filter.h @@ -38,7 +38,7 @@ class InterceptablePrefFilter // PrefFilter partial implementation. virtual void FilterOnLoad( const PostFilterOnLoadCallback& post_filter_on_load_callback, - scoped_ptr<base::DictionaryValue> pref_store_contents) OVERRIDE; + scoped_ptr<base::DictionaryValue> pref_store_contents) override; // Registers |filter_on_load_interceptor| to intercept the next FilterOnLoad // event. At most one FilterOnLoadInterceptor should be registered per diff --git a/chrome/browser/prefs/tracked/mock_validation_delegate.h b/chrome/browser/prefs/tracked/mock_validation_delegate.h index 1719e58..e572508 100644 --- a/chrome/browser/prefs/tracked/mock_validation_delegate.h +++ b/chrome/browser/prefs/tracked/mock_validation_delegate.h @@ -52,13 +52,13 @@ class MockValidationDelegate : public TrackedPreferenceValidationDelegate { const std::string& pref_path, const base::Value* value, PrefHashStoreTransaction::ValueState value_state, - TrackedPreferenceHelper::ResetAction reset_action) OVERRIDE; + TrackedPreferenceHelper::ResetAction reset_action) override; virtual void OnSplitPreferenceValidation( const std::string& pref_path, const base::DictionaryValue* dict_value, const std::vector<std::string>& invalid_keys, PrefHashStoreTransaction::ValueState value_state, - TrackedPreferenceHelper::ResetAction reset_action) OVERRIDE; + TrackedPreferenceHelper::ResetAction reset_action) override; private: // Adds a new validation event. diff --git a/chrome/browser/prefs/tracked/pref_hash_browsertest.cc b/chrome/browser/prefs/tracked/pref_hash_browsertest.cc index 72c8f7d..155ce31 100644 --- a/chrome/browser/prefs/tracked/pref_hash_browsertest.cc +++ b/chrome/browser/prefs/tracked/pref_hash_browsertest.cc @@ -147,7 +147,7 @@ class PrefHashBrowserTestBase : protection_level_(GetProtectionLevelFromTrialGroup(GetParam())) { } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionBrowserTest::SetUpCommandLine(command_line); EXPECT_FALSE(command_line->HasSwitch(switches::kForceFieldTrials)); command_line->AppendSwitchASCII( @@ -160,7 +160,7 @@ class PrefHashBrowserTestBase #endif } - virtual bool SetUpUserDataDirectory() OVERRIDE { + virtual bool SetUpUserDataDirectory() override { // Do the normal setup in the PRE test and attack preferences in the main // test. if (IsPRETest()) @@ -231,7 +231,7 @@ class PrefHashBrowserTestBase // In the PRE_ test, find the number of tracked preferences that were // initialized and save it to a file to be read back in the main test and used // as the total number of tracked preferences. - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ExtensionBrowserTest::SetUpOnMainThread(); // File in which the PRE_ test will save the number of tracked preferences @@ -354,17 +354,17 @@ class PrefHashBrowserTestBase // Also sanity checks that the expected preferences files are in place. class PrefHashBrowserTestUnchangedDefault : public PrefHashBrowserTestBase { public: - virtual void SetupPreferences() OVERRIDE { + virtual void SetupPreferences() override { // Default Chrome setup. } virtual void AttackPreferencesOnDisk( base::DictionaryValue* unprotected_preferences, - base::DictionaryValue* protected_preferences) OVERRIDE { + base::DictionaryValue* protected_preferences) override { // No attack. } - virtual void VerifyReactionToPrefAttack() OVERRIDE { + virtual void VerifyReactionToPrefAttack() override { // Expect all prefs to be reported as Unchanged with no resets. EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM ? num_tracked_prefs() : 0, @@ -408,14 +408,14 @@ PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUnchangedDefault, UnchangedDefault); class PrefHashBrowserTestUnchangedCustom : public PrefHashBrowserTestUnchangedDefault { public: - virtual void SetupPreferences() OVERRIDE { + virtual void SetupPreferences() override { profile()->GetPrefs()->SetString(prefs::kHomePage, "http://example.com"); InstallExtensionWithUIAutoConfirm( test_data_dir_.AppendASCII("good.crx"), 1, browser()); } - virtual void VerifyReactionToPrefAttack() OVERRIDE { + virtual void VerifyReactionToPrefAttack() override { // Make sure the settings written in the last run stuck. EXPECT_EQ("http://example.com", profile()->GetPrefs()->GetString(prefs::kHomePage)); @@ -432,13 +432,13 @@ PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUnchangedCustom, UnchangedCustom); // Verifies that cleared prefs are reported. class PrefHashBrowserTestClearedAtomic : public PrefHashBrowserTestBase { public: - virtual void SetupPreferences() OVERRIDE { + virtual void SetupPreferences() override { profile()->GetPrefs()->SetString(prefs::kHomePage, "http://example.com"); } virtual void AttackPreferencesOnDisk( base::DictionaryValue* unprotected_preferences, - base::DictionaryValue* protected_preferences) OVERRIDE { + base::DictionaryValue* protected_preferences) override { base::DictionaryValue* selected_prefs = protection_level_ >= PROTECTION_ENABLED_BASIC ? protected_preferences : unprotected_preferences; @@ -448,7 +448,7 @@ class PrefHashBrowserTestClearedAtomic : public PrefHashBrowserTestBase { EXPECT_TRUE(selected_prefs->Remove(prefs::kHomePage, NULL)); } - virtual void VerifyReactionToPrefAttack() OVERRIDE { + virtual void VerifyReactionToPrefAttack() override { // The clearance of homepage should have been noticed (as pref #2 being // cleared), but shouldn't have triggered a reset (as there is nothing we // can do when the pref is already gone). @@ -492,7 +492,7 @@ PREF_HASH_BROWSER_TEST(PrefHashBrowserTestClearedAtomic, ClearedAtomic); // non-null protected prefs. class PrefHashBrowserTestUntrustedInitialized : public PrefHashBrowserTestBase { public: - virtual void SetupPreferences() OVERRIDE { + virtual void SetupPreferences() override { // Explicitly set the DSE (it's otherwise NULL by default, preventing // thorough testing of the PROTECTION_ENABLED_DSE level). DefaultSearchManager default_search_manager( @@ -518,13 +518,13 @@ class PrefHashBrowserTestUntrustedInitialized : public PrefHashBrowserTestBase { virtual void AttackPreferencesOnDisk( base::DictionaryValue* unprotected_preferences, - base::DictionaryValue* protected_preferences) OVERRIDE { + base::DictionaryValue* protected_preferences) override { EXPECT_TRUE(unprotected_preferences->Remove("protection.macs", NULL)); if (protected_preferences) EXPECT_TRUE(protected_preferences->Remove("protection.macs", NULL)); } - virtual void VerifyReactionToPrefAttack() OVERRIDE { + virtual void VerifyReactionToPrefAttack() override { // Preferences that are NULL by default will be NullInitialized. int num_null_values = GetTrackedPrefHistogramCount( "Settings.TrackedPreferenceNullInitialized", ALLOW_ANY); @@ -613,7 +613,7 @@ PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUntrustedInitialized, // if the protection level allows it). class PrefHashBrowserTestChangedAtomic : public PrefHashBrowserTestBase { public: - virtual void SetupPreferences() OVERRIDE { + virtual void SetupPreferences() override { profile()->GetPrefs()->SetInteger(prefs::kRestoreOnStartup, SessionStartupPref::URLS); @@ -624,7 +624,7 @@ class PrefHashBrowserTestChangedAtomic : public PrefHashBrowserTestBase { virtual void AttackPreferencesOnDisk( base::DictionaryValue* unprotected_preferences, - base::DictionaryValue* protected_preferences) OVERRIDE { + base::DictionaryValue* protected_preferences) override { base::DictionaryValue* selected_prefs = protection_level_ >= PROTECTION_ENABLED_BASIC ? protected_preferences : unprotected_preferences; @@ -639,7 +639,7 @@ class PrefHashBrowserTestChangedAtomic : public PrefHashBrowserTestBase { startup_urls->AppendString("http://example.org"); } - virtual void VerifyReactionToPrefAttack() OVERRIDE { + virtual void VerifyReactionToPrefAttack() override { // Expect a single Changed event for tracked pref #4 (startup URLs). EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM ? 1 : 0, GetTrackedPrefHistogramCount("Settings.TrackedPreferenceChanged", @@ -695,14 +695,14 @@ PREF_HASH_BROWSER_TEST(PrefHashBrowserTestChangedAtomic, ChangedAtomic); // items being reported (and remove if the protection level allows it). class PrefHashBrowserTestChangedSplitPref : public PrefHashBrowserTestBase { public: - virtual void SetupPreferences() OVERRIDE { + virtual void SetupPreferences() override { InstallExtensionWithUIAutoConfirm( test_data_dir_.AppendASCII("good.crx"), 1, browser()); } virtual void AttackPreferencesOnDisk( base::DictionaryValue* unprotected_preferences, - base::DictionaryValue* protected_preferences) OVERRIDE { + base::DictionaryValue* protected_preferences) override { base::DictionaryValue* selected_prefs = protection_level_ >= PROTECTION_ENABLED_EXTENSIONS ? protected_preferences @@ -730,7 +730,7 @@ class PrefHashBrowserTestChangedSplitPref : public PrefHashBrowserTestBase { extensions_dict->Set(std::string(32, 'a'), fake_extension); } - virtual void VerifyReactionToPrefAttack() OVERRIDE { + virtual void VerifyReactionToPrefAttack() override { // Expect a single split pref changed report with a count of 2 for tracked // pref #5 (extensions). EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM ? 1 : 0, @@ -788,7 +788,7 @@ PREF_HASH_BROWSER_TEST(PrefHashBrowserTestChangedSplitPref, ChangedSplitPref); class PrefHashBrowserTestUntrustedAdditionToPrefs : public PrefHashBrowserTestBase { public: - virtual void SetupPreferences() OVERRIDE { + virtual void SetupPreferences() override { // Ensure there is no user-selected value for kRestoreOnStartup. EXPECT_FALSE( profile()->GetPrefs()->GetUserPrefValue(prefs::kRestoreOnStartup)); @@ -796,12 +796,12 @@ class PrefHashBrowserTestUntrustedAdditionToPrefs virtual void AttackPreferencesOnDisk( base::DictionaryValue* unprotected_preferences, - base::DictionaryValue* protected_preferences) OVERRIDE { + base::DictionaryValue* protected_preferences) override { unprotected_preferences->SetInteger(prefs::kRestoreOnStartup, SessionStartupPref::LAST); } - virtual void VerifyReactionToPrefAttack() OVERRIDE { + virtual void VerifyReactionToPrefAttack() override { // Expect a single Changed event for tracked pref #3 (kRestoreOnStartup) if // not protecting; if protection is enabled the change should be a no-op. int changed_expected = @@ -854,13 +854,13 @@ PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUntrustedAdditionToPrefs, class PrefHashBrowserTestUntrustedAdditionToPrefsAfterWipe : public PrefHashBrowserTestBase { public: - virtual void SetupPreferences() OVERRIDE { + virtual void SetupPreferences() override { profile()->GetPrefs()->SetString(prefs::kHomePage, "http://example.com"); } virtual void AttackPreferencesOnDisk( base::DictionaryValue* unprotected_preferences, - base::DictionaryValue* protected_preferences) OVERRIDE { + base::DictionaryValue* protected_preferences) override { // Set or change the value in Preferences to the attacker's choice. unprotected_preferences->SetString(prefs::kHomePage, "http://example.net"); // Clear the value in Secure Preferences, if any. @@ -868,7 +868,7 @@ class PrefHashBrowserTestUntrustedAdditionToPrefsAfterWipe protected_preferences->Remove(prefs::kHomePage, NULL); } - virtual void VerifyReactionToPrefAttack() OVERRIDE { + virtual void VerifyReactionToPrefAttack() override { // Expect a single Changed event for tracked pref #2 (kHomePage) if // not protecting; if protection is enabled the change should be a Cleared. int changed_expected = diff --git a/chrome/browser/prefs/tracked/pref_hash_filter.h b/chrome/browser/prefs/tracked/pref_hash_filter.h index 6685728..1c1a3c8 100644 --- a/chrome/browser/prefs/tracked/pref_hash_filter.h +++ b/chrome/browser/prefs/tracked/pref_hash_filter.h @@ -94,16 +94,16 @@ class PrefHashFilter : public InterceptablePrefFilter { void Initialize(base::DictionaryValue* pref_store_contents); // PrefFilter remaining implementation. - virtual void FilterUpdate(const std::string& path) OVERRIDE; + virtual void FilterUpdate(const std::string& path) override; virtual void FilterSerializeData( - base::DictionaryValue* pref_store_contents) OVERRIDE; + base::DictionaryValue* pref_store_contents) override; private: // InterceptablePrefFilter implementation. virtual void FinalizeFilterOnLoad( const PostFilterOnLoadCallback& post_filter_on_load_callback, scoped_ptr<base::DictionaryValue> pref_store_contents, - bool prefs_altered) OVERRIDE; + bool prefs_altered) override; // Callback to be invoked only once (and subsequently reset) on the next // FilterOnLoad event. It will be allowed to modify the |prefs| handed to diff --git a/chrome/browser/prefs/tracked/pref_hash_filter_unittest.cc b/chrome/browser/prefs/tracked/pref_hash_filter_unittest.cc index ed6adcb..d9e1bb0 100644 --- a/chrome/browser/prefs/tracked/pref_hash_filter_unittest.cc +++ b/chrome/browser/prefs/tracked/pref_hash_filter_unittest.cc @@ -154,7 +154,7 @@ class MockPrefHashStore : public PrefHashStore { // PrefHashStore implementation. virtual scoped_ptr<PrefHashStoreTransaction> BeginTransaction( - scoped_ptr<HashStoreContents> storage) OVERRIDE; + scoped_ptr<HashStoreContents> storage) override; private: // A MockPrefHashStoreTransaction is handed to the caller on @@ -173,22 +173,22 @@ class MockPrefHashStore : public PrefHashStore { // PrefHashStoreTransaction implementation. virtual PrefHashStoreTransaction::ValueState CheckValue( - const std::string& path, const base::Value* value) const OVERRIDE; + const std::string& path, const base::Value* value) const override; virtual void StoreHash(const std::string& path, - const base::Value* new_value) OVERRIDE; + const base::Value* new_value) override; virtual PrefHashStoreTransaction::ValueState CheckSplitValue( const std::string& path, const base::DictionaryValue* initial_split_value, - std::vector<std::string>* invalid_keys) const OVERRIDE; + std::vector<std::string>* invalid_keys) const override; virtual void StoreSplitHash( const std::string& path, - const base::DictionaryValue* split_value) OVERRIDE; - virtual bool HasHash(const std::string& path) const OVERRIDE; + const base::DictionaryValue* split_value) override; + virtual bool HasHash(const std::string& path) const override; virtual void ImportHash(const std::string& path, - const base::Value* hash) OVERRIDE; - virtual void ClearHash(const std::string& path) OVERRIDE; - virtual bool IsSuperMACValid() const OVERRIDE; - virtual bool StampSuperMac() OVERRIDE; + const base::Value* hash) override; + virtual void ClearHash(const std::string& path) override; + virtual bool IsSuperMACValid() const override; + virtual bool StampSuperMac() override; private: MockPrefHashStore* outer_; @@ -369,7 +369,7 @@ class PrefHashFilterTest last_filter_on_load_modified_prefs_(false), reset_recorded_(false) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { base::StatisticsRecorder::Initialize(); Reset(); } diff --git a/chrome/browser/prefs/tracked/pref_hash_store_impl.cc b/chrome/browser/prefs/tracked/pref_hash_store_impl.cc index e7862b8..a99db41 100644 --- a/chrome/browser/prefs/tracked/pref_hash_store_impl.cc +++ b/chrome/browser/prefs/tracked/pref_hash_store_impl.cc @@ -21,22 +21,22 @@ class PrefHashStoreImpl::PrefHashStoreTransactionImpl // PrefHashStoreTransaction implementation. virtual ValueState CheckValue(const std::string& path, - const base::Value* value) const OVERRIDE; + const base::Value* value) const override; virtual void StoreHash(const std::string& path, - const base::Value* value) OVERRIDE; + const base::Value* value) override; virtual ValueState CheckSplitValue( const std::string& path, const base::DictionaryValue* initial_split_value, - std::vector<std::string>* invalid_keys) const OVERRIDE; + std::vector<std::string>* invalid_keys) const override; virtual void StoreSplitHash( const std::string& path, - const base::DictionaryValue* split_value) OVERRIDE; - virtual bool HasHash(const std::string& path) const OVERRIDE; + const base::DictionaryValue* split_value) override; + virtual bool HasHash(const std::string& path) const override; virtual void ImportHash(const std::string& path, - const base::Value* hash) OVERRIDE; - virtual void ClearHash(const std::string& path) OVERRIDE; - virtual bool IsSuperMACValid() const OVERRIDE; - virtual bool StampSuperMac() OVERRIDE; + const base::Value* hash) override; + virtual void ClearHash(const std::string& path) override; + virtual bool IsSuperMACValid() const override; + virtual bool StampSuperMac() override; private: bool GetSplitMacs(const std::string& path, diff --git a/chrome/browser/prefs/tracked/pref_hash_store_impl.h b/chrome/browser/prefs/tracked/pref_hash_store_impl.h index 1a6b91b..2b4640f 100644 --- a/chrome/browser/prefs/tracked/pref_hash_store_impl.h +++ b/chrome/browser/prefs/tracked/pref_hash_store_impl.h @@ -52,7 +52,7 @@ class PrefHashStoreImpl : public PrefHashStore { // PrefHashStore implementation. virtual scoped_ptr<PrefHashStoreTransaction> BeginTransaction( - scoped_ptr<HashStoreContents> storage) OVERRIDE; + scoped_ptr<HashStoreContents> storage) override; private: class PrefHashStoreTransactionImpl; diff --git a/chrome/browser/prefs/tracked/pref_service_hash_store_contents.cc b/chrome/browser/prefs/tracked/pref_service_hash_store_contents.cc index ba85cf8..a59eb84 100644 --- a/chrome/browser/prefs/tracked/pref_service_hash_store_contents.cc +++ b/chrome/browser/prefs/tracked/pref_service_hash_store_contents.cc @@ -23,7 +23,7 @@ class PrefServiceMutableDictionary PrefService* pref_service); // HashStoreContents::MutableDictionary implementation - virtual base::DictionaryValue* operator->() OVERRIDE; + virtual base::DictionaryValue* operator->() override; private: const std::string key_; diff --git a/chrome/browser/prefs/tracked/pref_service_hash_store_contents.h b/chrome/browser/prefs/tracked/pref_service_hash_store_contents.h index d7a36ba..851e2ad 100644 --- a/chrome/browser/prefs/tracked/pref_service_hash_store_contents.h +++ b/chrome/browser/prefs/tracked/pref_service_hash_store_contents.h @@ -54,13 +54,13 @@ class PrefServiceHashStoreContents : public HashStoreContents { static void ResetAllPrefHashStores(PrefService* pref_service); // HashStoreContents implementation - virtual std::string hash_store_id() const OVERRIDE; - virtual void Reset() OVERRIDE; - virtual bool IsInitialized() const OVERRIDE; - virtual const base::DictionaryValue* GetContents() const OVERRIDE; - virtual scoped_ptr<MutableDictionary> GetMutableContents() OVERRIDE; - virtual std::string GetSuperMac() const OVERRIDE; - virtual void SetSuperMac(const std::string& super_mac) OVERRIDE; + virtual std::string hash_store_id() const override; + virtual void Reset() override; + virtual bool IsInitialized() const override; + virtual const base::DictionaryValue* GetContents() const override; + virtual scoped_ptr<MutableDictionary> GetMutableContents() override; + virtual std::string GetSuperMac() const override; + virtual void SetSuperMac(const std::string& super_mac) override; private: const std::string hash_store_id_; diff --git a/chrome/browser/prefs/tracked/pref_service_hash_store_contents_unittest.cc b/chrome/browser/prefs/tracked/pref_service_hash_store_contents_unittest.cc index ac46816..d0e83e3 100644 --- a/chrome/browser/prefs/tracked/pref_service_hash_store_contents_unittest.cc +++ b/chrome/browser/prefs/tracked/pref_service_hash_store_contents_unittest.cc @@ -13,7 +13,7 @@ class PrefServiceHashStoreContentsTest : public testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { PrefServiceHashStoreContents::RegisterPrefs(local_state_.registry()); } diff --git a/chrome/browser/prefs/tracked/segregated_pref_store.h b/chrome/browser/prefs/tracked/segregated_pref_store.h index fc8ef91..aea3a3b 100644 --- a/chrome/browser/prefs/tracked/segregated_pref_store.h +++ b/chrome/browser/prefs/tracked/segregated_pref_store.h @@ -44,28 +44,28 @@ class SegregatedPrefStore : public PersistentPrefStore { const std::set<std::string>& selected_pref_names); // PrefStore implementation - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual bool HasObservers() const OVERRIDE; - virtual bool IsInitializationComplete() const OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual bool HasObservers() const override; + virtual bool IsInitializationComplete() const override; virtual bool GetValue(const std::string& key, - const base::Value** result) const OVERRIDE; + const base::Value** result) const override; // WriteablePrefStore implementation - virtual void SetValue(const std::string& key, base::Value* value) OVERRIDE; - virtual void RemoveValue(const std::string& key) OVERRIDE; + virtual void SetValue(const std::string& key, base::Value* value) override; + virtual void RemoveValue(const std::string& key) override; // PersistentPrefStore implementation virtual bool GetMutableValue(const std::string& key, - base::Value** result) OVERRIDE; - virtual void ReportValueChanged(const std::string& key) OVERRIDE; + base::Value** result) override; + virtual void ReportValueChanged(const std::string& key) override; virtual void SetValueSilently(const std::string& key, - base::Value* value) OVERRIDE; - virtual bool ReadOnly() const OVERRIDE; - virtual PrefReadError GetReadError() const OVERRIDE; - virtual PrefReadError ReadPrefs() OVERRIDE; - virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) OVERRIDE; - virtual void CommitPendingWrite() OVERRIDE; + base::Value* value) override; + virtual bool ReadOnly() const override; + virtual PrefReadError GetReadError() const override; + virtual PrefReadError ReadPrefs() override; + virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) override; + virtual void CommitPendingWrite() override; private: // Aggregates events from the underlying stores and synthesizes external @@ -75,8 +75,8 @@ class SegregatedPrefStore : public PersistentPrefStore { explicit AggregatingObserver(SegregatedPrefStore* outer); // PrefStore::Observer implementation - virtual void OnPrefValueChanged(const std::string& key) OVERRIDE; - virtual void OnInitializationCompleted(bool succeeded) OVERRIDE; + virtual void OnPrefValueChanged(const std::string& key) override; + virtual void OnInitializationCompleted(bool succeeded) override; private: SegregatedPrefStore* outer_; diff --git a/chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc b/chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc index a7f582d..6d1a8f8 100644 --- a/chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc +++ b/chrome/browser/prefs/tracked/segregated_pref_store_unittest.cc @@ -42,7 +42,7 @@ class MockReadErrorDelegate : public PersistentPrefStore::ReadErrorDelegate { } // PersistentPrefStore::ReadErrorDelegate implementation - virtual void OnError(PersistentPrefStore::PrefReadError read_error) OVERRIDE { + virtual void OnError(PersistentPrefStore::PrefReadError read_error) override { EXPECT_FALSE(data_->invoked); data_->invoked = true; data_->read_error = read_error; @@ -62,7 +62,7 @@ class SegregatedPrefStoreTest : public testing::Test { read_error_delegate_( new MockReadErrorDelegate(&read_error_delegate_data_)) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { selected_store_ = new TestingPrefStore; default_store_ = new TestingPrefStore; @@ -77,7 +77,7 @@ class SegregatedPrefStoreTest : public testing::Test { segregated_store_->AddObserver(&observer_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { segregated_store_->RemoveObserver(&observer_); } diff --git a/chrome/browser/prefs/tracked/tracked_atomic_preference.h b/chrome/browser/prefs/tracked/tracked_atomic_preference.h index 3265452..f3ee9c7 100644 --- a/chrome/browser/prefs/tracked/tracked_atomic_preference.h +++ b/chrome/browser/prefs/tracked/tracked_atomic_preference.h @@ -28,10 +28,10 @@ class TrackedAtomicPreference : public TrackedPreference { // TrackedPreference implementation. virtual void OnNewValue(const base::Value* value, - PrefHashStoreTransaction* transaction) const OVERRIDE; + PrefHashStoreTransaction* transaction) const override; virtual bool EnforceAndReport( base::DictionaryValue* pref_store_contents, - PrefHashStoreTransaction* transaction) const OVERRIDE; + PrefHashStoreTransaction* transaction) const override; private: const std::string pref_path_; diff --git a/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc b/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc index e42e08c..bf7e0fa 100644 --- a/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc +++ b/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc @@ -46,11 +46,11 @@ const char kPreviouslyProtectedPrefValue[] = "previously_protected_value"; class SimpleInterceptablePrefFilter : public InterceptablePrefFilter { public: // PrefFilter remaining implementation. - virtual void FilterUpdate(const std::string& path) OVERRIDE { + virtual void FilterUpdate(const std::string& path) override { ADD_FAILURE(); } virtual void FilterSerializeData( - base::DictionaryValue* pref_store_contents) OVERRIDE { + base::DictionaryValue* pref_store_contents) override { ADD_FAILURE(); } @@ -59,7 +59,7 @@ class SimpleInterceptablePrefFilter : public InterceptablePrefFilter { virtual void FinalizeFilterOnLoad( const PostFilterOnLoadCallback& post_filter_on_load_callback, scoped_ptr<base::DictionaryValue> pref_store_contents, - bool prefs_altered) OVERRIDE { + bool prefs_altered) override { post_filter_on_load_callback.Run(pref_store_contents.Pass(), prefs_altered); } }; @@ -86,7 +86,7 @@ class TrackedPreferencesMigrationTest : public testing::Test { unprotected_store_migration_complete_(false), protected_store_migration_complete_(false) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ProfilePrefStoreManager::RegisterPrefs(local_state_.registry()); Reset(); } diff --git a/chrome/browser/prefs/tracked/tracked_split_preference.h b/chrome/browser/prefs/tracked/tracked_split_preference.h index dfb322a..0bbe7c7 100644 --- a/chrome/browser/prefs/tracked/tracked_split_preference.h +++ b/chrome/browser/prefs/tracked/tracked_split_preference.h @@ -31,10 +31,10 @@ class TrackedSplitPreference : public TrackedPreference { // TrackedPreference implementation. virtual void OnNewValue(const base::Value* value, - PrefHashStoreTransaction* transaction) const OVERRIDE; + PrefHashStoreTransaction* transaction) const override; virtual bool EnforceAndReport( base::DictionaryValue* pref_store_contents, - PrefHashStoreTransaction* transaction) const OVERRIDE; + PrefHashStoreTransaction* transaction) const override; private: const std::string pref_path_; diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 8890d47..48b195e 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -133,14 +133,14 @@ namespace { class MockNetworkChangeNotifierWIFI : public NetworkChangeNotifier { public: - virtual ConnectionType GetCurrentConnectionType() const OVERRIDE { + virtual ConnectionType GetCurrentConnectionType() const override { return NetworkChangeNotifier::CONNECTION_WIFI; } }; class MockNetworkChangeNotifier4G : public NetworkChangeNotifier { public: - virtual ConnectionType GetCurrentConnectionType() const OVERRIDE { + virtual ConnectionType GetCurrentConnectionType() const override { return NetworkChangeNotifier::CONNECTION_4G; } }; @@ -241,7 +241,7 @@ class ChannelDestructionWatcher { base::Unretained(watcher_))); } - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { return false; } @@ -311,10 +311,10 @@ class NavigationOrSwapObserver : public WebContentsObserver, } // WebContentsObserver implementation: - virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE { + virtual void DidStartLoading(RenderViewHost* render_view_host) override { did_start_loading_ = true; } - virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE { + virtual void DidStopLoading(RenderViewHost* render_view_host) override { if (!did_start_loading_) return; number_of_loads_--; @@ -326,7 +326,7 @@ class NavigationOrSwapObserver : public WebContentsObserver, virtual void TabReplacedAt(TabStripModel* tab_strip_model, WebContents* old_contents, WebContents* new_contents, - int index) OVERRIDE { + int index) override { if (old_contents != web_contents()) return; // Switch to observing the new WebContents. @@ -433,7 +433,7 @@ class TestPrerenderContents : public PrerenderContents { EXPECT_EQ(should_be_shown_, was_shown_); } - virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE { + virtual void RenderProcessGone(base::TerminationStatus status) override { // On quit, it's possible to end up here when render processes are closed // before the PrerenderManager is destroyed. As a result, it's possible to // get either FINAL_STATUS_APP_TERMINATING or FINAL_STATUS_RENDERER_CRASHED @@ -450,7 +450,7 @@ class TestPrerenderContents : public PrerenderContents { PrerenderContents::RenderProcessGone(status); } - virtual bool CheckURL(const GURL& url) OVERRIDE { + virtual bool CheckURL(const GURL& url) override { // Prevent FINAL_STATUS_UNSUPPORTED_SCHEME when navigating to about:crash in // the PrerenderRendererCrash test. if (url.spec() != content::kChromeUICrashURL) @@ -470,7 +470,7 @@ class TestPrerenderContents : public PrerenderContents { private: virtual void OnRenderViewHostCreated( - RenderViewHost* new_render_view_host) OVERRIDE { + RenderViewHost* new_render_view_host) override { // Used to make sure the RenderViewHost is hidden and, if used, // subsequently shown. notification_registrar().Add( @@ -485,7 +485,7 @@ class TestPrerenderContents : public PrerenderContents { virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { if (type == content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED) { EXPECT_EQ(new_render_view_host_, @@ -569,17 +569,17 @@ class TestPrerender : public PrerenderContents::Observer, } // PrerenderContents::Observer implementation: - virtual void OnPrerenderStart(PrerenderContents* contents) OVERRIDE { + virtual void OnPrerenderStart(PrerenderContents* contents) override { start_loop_.Quit(); } - virtual void OnPrerenderStopLoading(PrerenderContents* contents) OVERRIDE { + virtual void OnPrerenderStopLoading(PrerenderContents* contents) override { number_of_loads_++; if (load_waiter_ && number_of_loads_ >= expected_number_of_loads_) load_waiter_->Quit(); } - virtual void OnPrerenderStop(PrerenderContents* contents) OVERRIDE { + virtual void OnPrerenderStop(PrerenderContents* contents) override { DCHECK(contents_); contents_ = NULL; stop_loop_.Quit(); @@ -590,7 +590,7 @@ class TestPrerender : public PrerenderContents::Observer, } virtual void OnPrerenderCreatedMatchCompleteReplacement( - PrerenderContents* contents, PrerenderContents* replacement) OVERRIDE { + PrerenderContents* contents, PrerenderContents* replacement) override { } private: @@ -629,7 +629,7 @@ class TestPrerenderContentsFactory : public PrerenderContents::Factory { const GURL& url, const content::Referrer& referrer, Origin origin, - uint8 experiment_id) OVERRIDE { + uint8 experiment_id) override { ExpectedContents expected; if (!expected_contents_queue_.empty()) { expected = expected_contents_queue_.front(); @@ -681,7 +681,7 @@ class FakeSafeBrowsingDatabaseManager : public SafeBrowsingDatabaseManager { // (in which that result will be communicated back via a call into the // client, and false will be returned). // Overrides SafeBrowsingService::CheckBrowseUrl. - virtual bool CheckBrowseUrl(const GURL& gurl, Client* client) OVERRIDE { + virtual bool CheckBrowseUrl(const GURL& gurl, Client* client) override { if (gurl != url_ || threat_type_ == SB_THREAT_TYPE_SAFE) return true; @@ -732,7 +732,7 @@ class FakeSafeBrowsingService : public SafeBrowsingService { protected: virtual ~FakeSafeBrowsingService() { } - virtual SafeBrowsingDatabaseManager* CreateDatabaseManager() OVERRIDE { + virtual SafeBrowsingDatabaseManager* CreateDatabaseManager() override { fake_database_manager_ = new FakeSafeBrowsingDatabaseManager(this); return fake_database_manager_; } @@ -750,7 +750,7 @@ class TestSafeBrowsingServiceFactory : public SafeBrowsingServiceFactory { most_recent_service_(NULL) { } virtual ~TestSafeBrowsingServiceFactory() { } - virtual SafeBrowsingService* CreateSafeBrowsingService() OVERRIDE { + virtual SafeBrowsingService* CreateSafeBrowsingService() override { most_recent_service_ = new FakeSafeBrowsingService(); return most_recent_service_; } @@ -769,9 +769,9 @@ class FakeDevToolsClient : public content::DevToolsAgentHostClient { FakeDevToolsClient() {} virtual ~FakeDevToolsClient() {} virtual void DispatchProtocolMessage( - DevToolsAgentHost* agent_host, const std::string& message) OVERRIDE {} + DevToolsAgentHost* agent_host, const std::string& message) override {} virtual void AgentHostClosed( - DevToolsAgentHost* agent_host, bool replaced) OVERRIDE {} + DevToolsAgentHost* agent_host, bool replaced) override {} }; class RestorePrerenderMode { @@ -792,7 +792,7 @@ class HangingURLRequestJob : public net::URLRequestJob { : net::URLRequestJob(request, network_delegate) { } - virtual void Start() OVERRIDE {} + virtual void Start() override {} private: virtual ~HangingURLRequestJob() {} @@ -810,7 +810,7 @@ class HangingFirstRequestInterceptor : public net::URLRequestInterceptor { virtual net::URLRequestJob* MaybeInterceptRequest( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { if (first_run_) { first_run_ = false; if (!callback_.is_null()) { @@ -862,7 +862,7 @@ class MockHTTPJob : public net::URLRequestMockHTTPJob { start_callback_ = start_callback; } - virtual void Start() OVERRIDE { + virtual void Start() override { if (!start_callback_.is_null()) start_callback_.Run(); net::URLRequestMockHTTPJob::Start(); @@ -918,7 +918,7 @@ class CountingInterceptor : public net::URLRequestInterceptor { virtual net::URLRequestJob* MaybeInterceptRequest( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { MockHTTPJob* job = new MockHTTPJob(request, network_delegate, file_); job->set_start_callback(base::Bind(&CountingInterceptor::RequestStarted, weak_factory_.GetWeakPtr())); @@ -967,7 +967,7 @@ class TestContentBrowserClient : public chrome::ChromeContentBrowserClient { // chrome::ChromeContentBrowserClient implementation. virtual bool ShouldAllowOpenURL(content::SiteInstance* site_instance, - const GURL& url) OVERRIDE { + const GURL& url) override { PrerenderManagerFactory::GetForProfile( Profile::FromBrowserContext(site_instance->GetBrowserContext())) ->CancelAllPrerenders(); @@ -990,7 +990,7 @@ class SwapProcessesContentBrowserClient virtual bool ShouldSwapProcessesForRedirect( content::ResourceContext* resource_context, const GURL& current_url, - const GURL& new_url) OVERRIDE { + const GURL& new_url) override { return true; } @@ -1006,28 +1006,28 @@ class NeverRunsExternalProtocolHandlerDelegate // ExternalProtocolHandler::Delegate implementation. virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker( ShellIntegration::DefaultWebClientObserver* observer, - const std::string& protocol) OVERRIDE { + const std::string& protocol) override { NOTREACHED(); // This will crash, but it shouldn't get this far with BlockState::BLOCK // anyway. return NULL; } virtual ExternalProtocolHandler::BlockState GetBlockState( - const std::string& scheme) OVERRIDE { + const std::string& scheme) override { // Block everything and fail the test. ADD_FAILURE(); return ExternalProtocolHandler::BLOCK; } - virtual void BlockRequest() OVERRIDE { } + virtual void BlockRequest() override { } virtual void RunExternalProtocolDialog(const GURL& url, int render_process_host_id, - int routing_id) OVERRIDE { + int routing_id) override { NOTREACHED(); } - virtual void LaunchUrlWithoutSecurityCheck(const GURL& url) OVERRIDE { + virtual void LaunchUrlWithoutSecurityCheck(const GURL& url) override { NOTREACHED(); } - virtual void FinishedProcessingCheck() OVERRIDE { + virtual void FinishedProcessingCheck() override { NOTREACHED(); } }; @@ -1063,19 +1063,19 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { return web_contents->GetController().GetDefaultSessionStorageNamespace(); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { #if defined(FULL_SAFE_BROWSING) SafeBrowsingService::RegisterFactory(safe_browsing_factory_.get()); #endif } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { #if defined(FULL_SAFE_BROWSING) SafeBrowsingService::RegisterFactory(NULL); #endif } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitchASCII(switches::kPrerenderMode, switches::kPrerenderModeSwitchValueEnabled); #if defined(OS_MACOSX) @@ -1164,7 +1164,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { } } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { current_browser()->profile()->GetPrefs()->SetBoolean( prefs::kPromptForDownload, false); IncreasePrerenderMemory(); @@ -3022,7 +3022,7 @@ class TestClientCertStore : public net::ClientCertStore { // net::ClientCertStore: virtual void GetClientCerts(const net::SSLCertRequestInfo& cert_request_info, net::CertificateList* selected_certs, - const base::Closure& callback) OVERRIDE { + const base::Closure& callback) override { *selected_certs = net::CertificateList( 1, scoped_refptr<net::X509Certificate>( new net::X509Certificate("test", "test", base::Time(), base::Time()))); @@ -3535,7 +3535,7 @@ class PrerenderBrowserTestWithNaCl : public PrerenderBrowserTest { PrerenderBrowserTestWithNaCl() {} virtual ~PrerenderBrowserTestWithNaCl() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { PrerenderBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnableNaCl); } @@ -3621,26 +3621,26 @@ class PrerenderBrowserTestWithExtensions : public PrerenderBrowserTest, autostart_test_server_ = false; } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { PrerenderBrowserTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { PrerenderBrowserTest::SetUpCommandLine(command_line); ExtensionApiTest::SetUpCommandLine(command_line); } - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { PrerenderBrowserTest::SetUpInProcessBrowserTestFixture(); ExtensionApiTest::SetUpInProcessBrowserTestFixture(); } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { PrerenderBrowserTest::TearDownInProcessBrowserTestFixture(); ExtensionApiTest::TearDownInProcessBrowserTestFixture(); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { PrerenderBrowserTest::SetUpOnMainThread(); } }; @@ -4416,7 +4416,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderWindowClose) { class PrerenderIncognitoBrowserTest : public PrerenderBrowserTest { public: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { Profile* normal_profile = current_browser()->profile(); set_browser(ui_test_utils::OpenURLOffTheRecord( normal_profile, GURL("about:blank"))); diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc index 383f44a..767e208 100644 --- a/chrome/browser/prerender/prerender_contents.cc +++ b/chrome/browser/prerender/prerender_contents.cc @@ -102,7 +102,7 @@ class PrerenderContentsFactoryImpl : public PrerenderContents::Factory { virtual PrerenderContents* CreatePrerenderContents( PrerenderManager* prerender_manager, Profile* profile, const GURL& url, const content::Referrer& referrer, - Origin origin, uint8 experiment_id) OVERRIDE { + Origin origin, uint8 experiment_id) override { return new PrerenderContents(prerender_manager, profile, url, referrer, origin, experiment_id); } @@ -119,7 +119,7 @@ class PrerenderContents::WebContentsDelegateImpl // content::WebContentsDelegate implementation: virtual WebContents* OpenURLFromTab(WebContents* source, - const OpenURLParams& params) OVERRIDE { + const OpenURLParams& params) override { // |OpenURLFromTab| is typically called when a frame performs a navigation // that requires the browser to perform the transition instead of WebKit. // Examples include prerendering a site that redirects to an app URL, @@ -131,7 +131,7 @@ class PrerenderContents::WebContentsDelegateImpl return NULL; } - virtual void CloseContents(content::WebContents* contents) OVERRIDE { + virtual void CloseContents(content::WebContents* contents) override { prerender_contents_->Destroy(FINAL_STATUS_CLOSED); } @@ -139,7 +139,7 @@ class PrerenderContents::WebContentsDelegateImpl RenderViewHost* render_view_host, const GURL& url, const std::string& request_method, - const base::Callback<void(bool)>& callback) OVERRIDE { + const base::Callback<void(bool)>& callback) override { prerender_contents_->Destroy(FINAL_STATUS_DOWNLOAD); // Cancel the download. callback.Run(false); @@ -152,7 +152,7 @@ class PrerenderContents::WebContentsDelegateImpl const base::string16& frame_name, const GURL& target_url, const std::string& partition_id, - SessionStorageNamespace* session_storage_namespace) OVERRIDE { + SessionStorageNamespace* session_storage_namespace) override { // Since we don't want to permit child windows that would have a // window.opener property, terminate prerendering. prerender_contents_->Destroy(FINAL_STATUS_CREATE_NEW_WINDOW); @@ -160,7 +160,7 @@ class PrerenderContents::WebContentsDelegateImpl return false; } - virtual bool OnGoToEntryOffset(int offset) OVERRIDE { + virtual bool OnGoToEntryOffset(int offset) override { // This isn't allowed because the history merge operation // does not work if there are renderer issued challenges. // TODO(cbentzel): Cancel in this case? May not need to do @@ -169,7 +169,7 @@ class PrerenderContents::WebContentsDelegateImpl return false; } - virtual bool ShouldSuppressDialogs() OVERRIDE { + virtual bool ShouldSuppressDialogs() override { // We still want to show the user the message when they navigate to this // page, so cancel this prerender. prerender_contents_->Destroy(FINAL_STATUS_JAVASCRIPT_ALERT); @@ -181,14 +181,14 @@ class PrerenderContents::WebContentsDelegateImpl virtual void RegisterProtocolHandler(WebContents* web_contents, const std::string& protocol, const GURL& url, - bool user_gesture) OVERRIDE { + bool user_gesture) override { // TODO(mmenke): Consider supporting this if it is a common case during // prerenders. prerender_contents_->Destroy(FINAL_STATUS_REGISTER_PROTOCOL_HANDLER); } virtual gfx::Size GetSizeForNewRenderView( - WebContents* web_contents) const OVERRIDE { + WebContents* web_contents) const override { // Have to set the size of the RenderView on initialization to be sure it is // set before the RenderView is hidden on all platforms (esp. Android). return prerender_contents_->size_; diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h index 469dcc6..bd257db7 100644 --- a/chrome/browser/prerender/prerender_contents.h +++ b/chrome/browser/prerender/prerender_contents.h @@ -206,32 +206,32 @@ class PrerenderContents : public content::NotificationObserver, // content::WebContentsObserver implementation. virtual void RenderFrameCreated( - content::RenderFrameHost* render_frame_host) OVERRIDE; + content::RenderFrameHost* render_frame_host) override; virtual void DidStopLoading( - content::RenderViewHost* render_view_host) OVERRIDE; + content::RenderViewHost* render_view_host) override; virtual void DocumentLoadedInFrame( - content::RenderFrameHost* render_frame_host) OVERRIDE; + content::RenderFrameHost* render_frame_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 DidFinishLoad(content::RenderFrameHost* render_frame_host, - const GURL& validated_url) OVERRIDE; + const GURL& validated_url) override; virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const content::FrameNavigateParams& params) OVERRIDE; + const content::FrameNavigateParams& params) override; virtual void DidGetRedirectForResourceRequest( content::RenderViewHost* render_view_host, - const content::ResourceRedirectDetails& details) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + const content::ResourceRedirectDetails& details) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; + virtual void RenderProcessGone(base::TerminationStatus status) override; // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Checks that a URL may be prerendered, for one of the many redirections. If // the URL can not be prerendered - for example, it's an ftp URL - |this| will diff --git a/chrome/browser/prerender/prerender_cookie_store.h b/chrome/browser/prerender/prerender_cookie_store.h index e331341..e93bcd6 100644 --- a/chrome/browser/prerender/prerender_cookie_store.h +++ b/chrome/browser/prerender/prerender_cookie_store.h @@ -52,20 +52,20 @@ class PrerenderCookieStore : public net::CookieStore { const GURL& url, const std::string& cookie_line, const net::CookieOptions& options, - const SetCookiesCallback& callback) OVERRIDE; + const SetCookiesCallback& callback) override; virtual void GetCookiesWithOptionsAsync( const GURL& url, const net::CookieOptions& options, - const GetCookiesCallback& callback) OVERRIDE; + const GetCookiesCallback& callback) override; virtual void GetAllCookiesForURLAsync( const GURL& url, - const GetCookieListCallback& callback) OVERRIDE; + const GetCookieListCallback& callback) override; virtual void DeleteCookieAsync(const GURL& url, const std::string& cookie_name, - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; // All the following methods should not be used in the scenarios where // a PrerenderCookieStore is used. This will be checked via NOTREACHED(). @@ -76,17 +76,17 @@ class PrerenderCookieStore : public net::CookieStore { virtual void DeleteAllCreatedBetweenAsync( const base::Time& delete_begin, const base::Time& delete_end, - const DeleteCallback& callback) OVERRIDE; + const DeleteCallback& callback) override; virtual void DeleteAllCreatedBetweenForHostAsync( const base::Time delete_begin, const base::Time delete_end, const GURL& url, - const DeleteCallback& callback) OVERRIDE; + const DeleteCallback& callback) override; - virtual void DeleteSessionCookiesAsync(const DeleteCallback&) OVERRIDE; + virtual void DeleteSessionCookiesAsync(const DeleteCallback&) override; - virtual net::CookieMonster* GetCookieMonster() OVERRIDE; + virtual net::CookieMonster* GetCookieMonster() override; // Commits the changes made to the underlying cookie store, and switches // into forwarding mode. To be called on the IO thread. diff --git a/chrome/browser/prerender/prerender_handle.h b/chrome/browser/prerender/prerender_handle.h index 3a7f223..c97dc81 100644 --- a/chrome/browser/prerender/prerender_handle.h +++ b/chrome/browser/prerender/prerender_handle.h @@ -103,14 +103,14 @@ class PrerenderHandle : public base::NonThreadSafe, explicit PrerenderHandle(PrerenderManager::PrerenderData* prerender_data); // From PrerenderContents::Observer: - virtual void OnPrerenderStart(PrerenderContents* prerender_contents) OVERRIDE; + virtual void OnPrerenderStart(PrerenderContents* prerender_contents) override; virtual void OnPrerenderStopLoading(PrerenderContents* prerender_contents) - OVERRIDE; + override; virtual void OnPrerenderDomContentLoaded( - PrerenderContents* prerender_contents) OVERRIDE; - virtual void OnPrerenderStop(PrerenderContents* prerender_contents) OVERRIDE; + PrerenderContents* prerender_contents) override; + virtual void OnPrerenderStop(PrerenderContents* prerender_contents) override; virtual void OnPrerenderCreatedMatchCompleteReplacement( - PrerenderContents* contents, PrerenderContents* replacement) OVERRIDE; + PrerenderContents* contents, PrerenderContents* replacement) override; Observer* observer_; diff --git a/chrome/browser/prerender/prerender_link_manager.cc b/chrome/browser/prerender/prerender_link_manager.cc index 85c721d..4a2bb7c 100644 --- a/chrome/browser/prerender/prerender_link_manager.cc +++ b/chrome/browser/prerender/prerender_link_manager.cc @@ -121,9 +121,9 @@ class PrerenderLinkManager::PendingPrerenderManager launcher->AddObserver(this); } - virtual void OnPrerenderStart(PrerenderContents* launcher) OVERRIDE {} + virtual void OnPrerenderStart(PrerenderContents* launcher) override {} - virtual void OnPrerenderStop(PrerenderContents* launcher) OVERRIDE { + virtual void OnPrerenderStop(PrerenderContents* launcher) override { observed_launchers_.erase(launcher); if (launcher->final_status() == FINAL_STATUS_USED) { link_manager_->StartPendingPrerendersForLauncher(launcher); diff --git a/chrome/browser/prerender/prerender_link_manager.h b/chrome/browser/prerender/prerender_link_manager.h index 56e6ad8..7dc0360 100644 --- a/chrome/browser/prerender/prerender_link_manager.h +++ b/chrome/browser/prerender/prerender_link_manager.h @@ -144,17 +144,17 @@ class PrerenderLinkManager : public KeyedService, void CancelPendingPrerendersForLauncher(PrerenderContents* launcher); // From KeyedService: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // From PrerenderHandle::Observer: - virtual void OnPrerenderStart(PrerenderHandle* prerender_handle) OVERRIDE; + virtual void OnPrerenderStart(PrerenderHandle* prerender_handle) override; virtual void OnPrerenderStopLoading(PrerenderHandle* prerender_handle) - OVERRIDE; + override; virtual void OnPrerenderDomContentLoaded(PrerenderHandle* prerender_handle) - OVERRIDE; - virtual void OnPrerenderStop(PrerenderHandle* prerender_handle) OVERRIDE; + override; + virtual void OnPrerenderStop(PrerenderHandle* prerender_handle) override; virtual void OnPrerenderCreatedMatchCompleteReplacement( - PrerenderHandle* handle) OVERRIDE; + PrerenderHandle* handle) override; bool has_shutdown_; diff --git a/chrome/browser/prerender/prerender_link_manager_factory.h b/chrome/browser/prerender/prerender_link_manager_factory.h index ce0b69a..da82623 100644 --- a/chrome/browser/prerender/prerender_link_manager_factory.h +++ b/chrome/browser/prerender/prerender_link_manager_factory.h @@ -27,9 +27,9 @@ class PrerenderLinkManagerFactory : public BrowserContextKeyedServiceFactory { virtual ~PrerenderLinkManagerFactory() { } 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; }; } // namespace prerender diff --git a/chrome/browser/prerender/prerender_local_predictor.cc b/chrome/browser/prerender/prerender_local_predictor.cc index cd87edc..ecc68e5 100644 --- a/chrome/browser/prerender/prerender_local_predictor.cc +++ b/chrome/browser/prerender/prerender_local_predictor.cc @@ -176,14 +176,14 @@ class GetURLForURLIDTask : public history::HistoryDBTask { } virtual bool RunOnDBThread(history::HistoryBackend* backend, - history::HistoryDatabase* db) OVERRIDE { + history::HistoryDatabase* db) override { DoURLLookup(db, &request_->source_url_); for (int i = 0; i < static_cast<int>(request_->candidate_urls_.size()); i++) DoURLLookup(db, &request_->candidate_urls_[i]); return true; } - virtual void DoneRunOnMainThread() OVERRIDE { + virtual void DoneRunOnMainThread() override { callback_.Run(); TIMING_HISTOGRAM("Prerender.LocalPredictorURLLookupTime", base::Time::Now() - start_time_); @@ -217,12 +217,12 @@ class GetVisitHistoryTask : public history::HistoryDBTask { } virtual bool RunOnDBThread(history::HistoryBackend* backend, - history::HistoryDatabase* db) OVERRIDE { + history::HistoryDatabase* db) override { db->GetBriefVisitInfoOfMostRecentVisits(max_visits_, visit_history_.get()); return true; } - virtual void DoneRunOnMainThread() OVERRIDE { + virtual void DoneRunOnMainThread() override { local_predictor_->OnGetInitialVisitHistory(visit_history_.Pass()); } diff --git a/chrome/browser/prerender/prerender_local_predictor.h b/chrome/browser/prerender/prerender_local_predictor.h index 159cd19..a0e9fcd 100644 --- a/chrome/browser/prerender/prerender_local_predictor.h +++ b/chrome/browser/prerender/prerender_local_predictor.h @@ -157,7 +157,7 @@ class PrerenderLocalPredictor : public history::VisitDatabaseObserver, void Shutdown(); // history::VisitDatabaseObserver implementation - virtual void OnAddVisit(const history::BriefVisitInfo& info) OVERRIDE; + virtual void OnAddVisit(const history::BriefVisitInfo& info) override; void OnGetInitialVisitHistory( scoped_ptr<std::vector<history::BriefVisitInfo> > visit_history); @@ -167,7 +167,7 @@ class PrerenderLocalPredictor : public history::VisitDatabaseObserver, void OnTabHelperURLSeen(const GURL& url, content::WebContents* web_contents); // net::URLFetcherDelegate implementation: - void virtual OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + void virtual OnURLFetchComplete(const net::URLFetcher* source) override; private: struct PrerenderProperties; diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index bcdde9a..13c84c92 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -182,17 +182,17 @@ class PrerenderManager::OnCloseWebContentsDeleter base::TimeDelta::FromSeconds(kDeleteWithExtremePrejudiceSeconds)); } - virtual void CloseContents(WebContents* source) OVERRIDE { + virtual void CloseContents(WebContents* source) override { DCHECK_EQ(tab_, source); ScheduleWebContentsForDeletion(false); } - virtual void SwappedOut(WebContents* source) OVERRIDE { + virtual void SwappedOut(WebContents* source) override { DCHECK_EQ(tab_, source); ScheduleWebContentsForDeletion(false); } - virtual bool ShouldSuppressDialogs() OVERRIDE { + virtual bool ShouldSuppressDialogs() override { // Use this as a proxy for getting statistics on how often we fail to honor // the beforeunload event. suppressed_dialog_ = true; diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h index f357c30..8c33c93 100644 --- a/chrome/browser/prerender/prerender_manager.h +++ b/chrome/browser/prerender/prerender_manager.h @@ -112,7 +112,7 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>, virtual ~PrerenderManager(); // From KeyedService: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // Entry points for adding prerenders. @@ -281,11 +281,11 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>, // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // MediaCaptureDevicesDispatcher::Observer virtual void OnCreatingAudioStream(int render_process_id, - int render_frame_id) OVERRIDE; + int render_frame_id) override; const Config& config() const { return config_; } Config& mutable_config() { return config_; } @@ -369,7 +369,7 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>, // content::RenderProcessHostObserver implementation. virtual void RenderProcessHostDestroyed( - content::RenderProcessHost* host) OVERRIDE; + content::RenderProcessHost* host) override; // To be called once the cookie store for this profile has been loaded. void OnCookieStoreLoaded(); @@ -477,22 +477,22 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>, // content::WebContentsObserver implementation. 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& validated_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; - virtual void WebContentsDestroyed() OVERRIDE; + const base::string16& error_description) override; + virtual void WebContentsDestroyed() override; private: void RecordEvent(PrerenderEvent event) const; diff --git a/chrome/browser/prerender/prerender_manager_factory.h b/chrome/browser/prerender/prerender_manager_factory.h index b91926e..27c6b19 100644 --- a/chrome/browser/prerender/prerender_manager_factory.h +++ b/chrome/browser/prerender/prerender_manager_factory.h @@ -33,9 +33,9 @@ class PrerenderManagerFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory: 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; }; } // namespace prerender diff --git a/chrome/browser/prerender/prerender_message_filter.h b/chrome/browser/prerender/prerender_message_filter.h index 4c329bc..3680d4e 100644 --- a/chrome/browser/prerender/prerender_message_filter.h +++ b/chrome/browser/prerender/prerender_message_filter.h @@ -34,11 +34,11 @@ class PrerenderMessageFilter : public content::BrowserMessageFilter { virtual ~PrerenderMessageFilter(); // Overridden from content::BrowserMessageFilter. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; virtual void OverrideThreadForMessage( const IPC::Message& message, - content::BrowserThread::ID* thread) OVERRIDE; - virtual void OnChannelClosing() OVERRIDE; + content::BrowserThread::ID* thread) override; + virtual void OnChannelClosing() override; void OnAddPrerender(int prerender_id, const PrerenderAttributes& attributes, diff --git a/chrome/browser/prerender/prerender_pending_swap_throttle.h b/chrome/browser/prerender/prerender_pending_swap_throttle.h index ebc3e1a..6097ccd 100644 --- a/chrome/browser/prerender/prerender_pending_swap_throttle.h +++ b/chrome/browser/prerender/prerender_pending_swap_throttle.h @@ -31,9 +31,9 @@ class PrerenderPendingSwapThrottle PrerenderTracker* tracker); // content::ResourceThrottle implementation: - virtual void WillStartRequest(bool* defer) OVERRIDE; + virtual void WillStartRequest(bool* defer) override; - virtual const char* GetNameForLogging() const OVERRIDE; + virtual const char* GetNameForLogging() const override; // Called by the PrerenderTracker when the swap failed. // May only be called if currently throttling the resource. diff --git a/chrome/browser/prerender/prerender_resource_throttle.h b/chrome/browser/prerender/prerender_resource_throttle.h index c2535b9..dd6d5cc 100644 --- a/chrome/browser/prerender/prerender_resource_throttle.h +++ b/chrome/browser/prerender/prerender_resource_throttle.h @@ -31,9 +31,9 @@ class PrerenderResourceThrottle explicit PrerenderResourceThrottle(net::URLRequest* request); // content::ResourceThrottle implementation: - virtual void WillStartRequest(bool* defer) OVERRIDE; - virtual void WillRedirectRequest(const GURL& new_url, bool* defer) OVERRIDE; - virtual const char* GetNameForLogging() const OVERRIDE; + virtual void WillStartRequest(bool* defer) override; + virtual void WillRedirectRequest(const GURL& new_url, bool* defer) override; + virtual const char* GetNameForLogging() const override; // Called by the PrerenderContents when a prerender becomes visible. // May only be called if currently throttling the resource. diff --git a/chrome/browser/prerender/prerender_tab_helper.h b/chrome/browser/prerender/prerender_tab_helper.h index 32e43ff..f842f0b 100644 --- a/chrome/browser/prerender/prerender_tab_helper.h +++ b/chrome/browser/prerender/prerender_tab_helper.h @@ -53,18 +53,18 @@ class PrerenderTabHelper // content::WebContentsObserver implementation. virtual void DidGetRedirectForResourceRequest( content::RenderViewHost* render_view_host, - const content::ResourceRedirectDetails& details) OVERRIDE; + const content::ResourceRedirectDetails& details) override; virtual void DidStopLoading( - 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& validated_url, - ui::PageTransition transition_type) OVERRIDE; + ui::PageTransition transition_type) override; // Called when the URL of the main frame changed, either when the load // commits, or a redirect happens. diff --git a/chrome/browser/prerender/prerender_tracker_unittest.cc b/chrome/browser/prerender/prerender_tracker_unittest.cc index 5fc302b..4a48a87 100644 --- a/chrome/browser/prerender/prerender_tracker_unittest.cc +++ b/chrome/browser/prerender/prerender_tracker_unittest.cc @@ -52,12 +52,12 @@ class TestPrerenderContents : public PrerenderContents { PrerenderResourceThrottle::OverridePrerenderContentsForTesting(NULL); } - virtual bool GetChildId(int* child_id) const OVERRIDE { + virtual bool GetChildId(int* child_id) const override { *child_id = child_id_; return true; } - virtual bool GetRouteId(int* route_id) const OVERRIDE { + virtual bool GetRouteId(int* route_id) const override { *route_id = route_id_; return true; } @@ -90,7 +90,7 @@ class TestPrerenderManager : public PrerenderManager { // We never allocate our PrerenderContents in PrerenderManager, so we don't // ever want the default pending delete behaviour. virtual void MoveEntryToPendingDelete(PrerenderContents* entry, - FinalStatus final_status) OVERRIDE { + FinalStatus final_status) override { } }; @@ -121,7 +121,7 @@ class DeferredRedirectDelegate : public net::URLRequest::Delegate, // net::URLRequest::Delegate implementation: virtual void OnReceivedRedirect(net::URLRequest* request, const net::RedirectInfo& redirect_info, - bool* defer_redirect) OVERRIDE { + bool* defer_redirect) override { // Defer the redirect either way. *defer_redirect = true; @@ -129,22 +129,22 @@ class DeferredRedirectDelegate : public net::URLRequest::Delegate, throttle_->WillRedirectRequest(redirect_info.new_url, &was_deferred_); run_loop_->Quit(); } - virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE { } + virtual void OnResponseStarted(net::URLRequest* request) override { } virtual void OnReadCompleted(net::URLRequest* request, - int bytes_read) OVERRIDE { + int bytes_read) override { } // content::ResourceController implementation: - virtual void Cancel() OVERRIDE { + virtual void Cancel() override { EXPECT_FALSE(cancel_called_); EXPECT_FALSE(resume_called_); cancel_called_ = true; run_loop_->Quit(); } - virtual void CancelAndIgnore() OVERRIDE { Cancel(); } - virtual void CancelWithError(int error_code) OVERRIDE { Cancel(); } - virtual void Resume() OVERRIDE { + virtual void CancelAndIgnore() override { Cancel(); } + virtual void CancelWithError(int error_code) override { Cancel(); } + virtual void Resume() override { EXPECT_TRUE(was_deferred_); EXPECT_FALSE(cancel_called_); EXPECT_FALSE(resume_called_); diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc index 545308b..d144c84 100644 --- a/chrome/browser/prerender/prerender_unittest.cc +++ b/chrome/browser/prerender/prerender_unittest.cc @@ -57,16 +57,16 @@ class DummyPrerenderContents : public PrerenderContents { const gfx::Size& ALLOW_UNUSED size, content::SessionStorageNamespace* ALLOW_UNUSED session_storage_namespace, net::URLRequestContextGetter* ALLOW_UNUSED request_context) - OVERRIDE; + override; - virtual bool GetChildId(int* child_id) const OVERRIDE { + virtual bool GetChildId(int* child_id) const override { // Having a default child_id of -1 forces pending prerenders not to fail // on session storage and cross domain checking. *child_id = -1; return true; } - virtual bool GetRouteId(int* route_id) const OVERRIDE { + virtual bool GetRouteId(int* route_id) const override { *route_id = route_id_; return true; } @@ -112,7 +112,7 @@ class UnitTestPrerenderManager : public PrerenderManager { } // From KeyedService, via PrererenderManager: - virtual void Shutdown() OVERRIDE { + virtual void Shutdown() override { if (next_prerender_contents()) next_prerender_contents_->Destroy(FINAL_STATUS_MANAGER_SHUTDOWN); PrerenderManager::Shutdown(); @@ -120,7 +120,7 @@ class UnitTestPrerenderManager : public PrerenderManager { // From PrerenderManager: virtual void MoveEntryToPendingDelete(PrerenderContents* entry, - FinalStatus final_status) OVERRIDE { + FinalStatus final_status) override { if (entry == next_prerender_contents_.get()) return; PrerenderManager::MoveEntryToPendingDelete(entry, final_status); @@ -204,16 +204,16 @@ class UnitTestPrerenderManager : public PrerenderManager { } // from PrerenderManager - virtual Time GetCurrentTime() const OVERRIDE { + virtual Time GetCurrentTime() const override { return time_; } - virtual TimeTicks GetCurrentTimeTicks() const OVERRIDE { + virtual TimeTicks GetCurrentTimeTicks() const override { return time_ticks_; } virtual PrerenderContents* GetPrerenderContentsForRoute( - int child_id, int route_id) const OVERRIDE { + int child_id, int route_id) const override { // Overridden for the PrerenderLinkManager's pending prerender logic. PrerenderContentsMap::const_iterator iter = prerender_contents_map_.find( std::make_pair(child_id, route_id)); @@ -235,7 +235,7 @@ class UnitTestPrerenderManager : public PrerenderManager { } protected: - virtual net::URLRequestContextGetter* GetURLRequestContext() OVERRIDE { + virtual net::URLRequestContextGetter* GetURLRequestContext() override { return NULL; } @@ -252,7 +252,7 @@ class UnitTestPrerenderManager : public PrerenderManager { const GURL& url, const Referrer& referrer, Origin origin, - uint8 experiment_id) OVERRIDE { + uint8 experiment_id) override { CHECK(next_prerender_contents_.get()); EXPECT_EQ(url, next_prerender_contents_->prerender_url()); EXPECT_EQ(origin, next_prerender_contents_->origin()); diff --git a/chrome/browser/printing/background_printing_manager.cc b/chrome/browser/printing/background_printing_manager.cc index 1e5c58d..3a891bc 100644 --- a/chrome/browser/printing/background_printing_manager.cc +++ b/chrome/browser/printing/background_printing_manager.cc @@ -27,8 +27,8 @@ class BackgroundPrintingManager::Observer Observer(BackgroundPrintingManager* manager, WebContents* web_contents); private: - virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; - virtual void WebContentsDestroyed() OVERRIDE; + virtual void RenderProcessGone(base::TerminationStatus status) override; + virtual void WebContentsDestroyed() override; BackgroundPrintingManager* manager_; }; diff --git a/chrome/browser/printing/background_printing_manager.h b/chrome/browser/printing/background_printing_manager.h index f2fc62d..3899dbb 100644 --- a/chrome/browser/printing/background_printing_manager.h +++ b/chrome/browser/printing/background_printing_manager.h @@ -48,7 +48,7 @@ class BackgroundPrintingManager : public base::NonThreadSafe, // content::NotificationObserver overrides: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Schedule deletion of |preview_contents|. void DeletePreviewContents(content::WebContents* preview_contents); diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h index 10694e2..d8c6877 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h @@ -31,8 +31,8 @@ class CloudPrintProxyServiceFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* profile) const override; + virtual bool ServiceIsNULLWhileTesting() const override; }; #endif // CHROME_BROWSER_PRINTING_CLOUD_PRINT_CLOUD_PRINT_PROXY_SERVICE_FACTORY_H_ diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc index 0d323bb..db8129e 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc @@ -183,7 +183,7 @@ class TestCloudPrintProxyService : public CloudPrintProxyService { base::RunLoop().RunUntilIdle(); } - virtual ServiceProcessControl* GetServiceProcessControl() OVERRIDE { + virtual ServiceProcessControl* GetServiceProcessControl() override { return &process_control_; } MockServiceProcessControl* GetMockServiceProcessControl() { diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc index e03d85c..a6fc19e 100644 --- a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc +++ b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc @@ -89,7 +89,7 @@ void ShutdownTask() { class TestStartupClientChannelListener : public IPC::Listener { public: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { return false; } }; @@ -304,8 +304,8 @@ class CloudPrintProxyPolicyStartupTest : public base::MultiProcessTest, CloudPrintProxyPolicyStartupTest(); virtual ~CloudPrintProxyPolicyStartupTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; scoped_refptr<base::MessageLoopProxy> IOMessageLoopProxy() { return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); @@ -316,13 +316,13 @@ class CloudPrintProxyPolicyStartupTest : public base::MultiProcessTest, void ShutdownAndWaitForExitWithTimeout(base::ProcessHandle handle); // IPC::Listener implementation - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { return false; } - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; + virtual void OnChannelConnected(int32 peer_pid) override; // MultiProcessTest implementation. - virtual CommandLine MakeCmdLine(const std::string& procname) OVERRIDE; + virtual CommandLine MakeCmdLine(const std::string& procname) override; bool LaunchBrowser(const CommandLine& command_line, Profile* profile) { int return_code = 0; diff --git a/chrome/browser/printing/pdf_to_emf_converter.cc b/chrome/browser/printing/pdf_to_emf_converter.cc index f0e998b..d4fa00c 100644 --- a/chrome/browser/printing/pdf_to_emf_converter.cc +++ b/chrome/browser/printing/pdf_to_emf_converter.cc @@ -61,8 +61,8 @@ class LazyEmf : public MetafilePlayer { : temp_dir_(temp_dir), file_(file.Pass()) {} virtual ~LazyEmf() { Close(); } - virtual bool SafePlayback(HDC hdc) const OVERRIDE; - virtual bool SaveTo(base::File* file) const OVERRIDE; + virtual bool SafePlayback(HDC hdc) const override; + virtual bool SaveTo(base::File* file) const override; private: void Close() const; @@ -103,9 +103,9 @@ class PdfToEmfUtilityProcessHostClient void Stop(); // 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; private: class GetPageCallbackData { @@ -183,10 +183,10 @@ class PdfToEmfConverterImpl : public PdfToEmfConverter { virtual void Start(const scoped_refptr<base::RefCountedMemory>& data, const PdfRenderSettings& conversion_settings, - const StartCallback& start_callback) OVERRIDE; + const StartCallback& start_callback) override; virtual void GetPage(int page_number, - const GetPageCallback& get_page_callback) OVERRIDE; + const GetPageCallback& get_page_callback) override; // Helps to cancel callbacks if this object is destroyed. void RunCallback(const base::Closure& callback); diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index cbd935b..5aa77ae 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -145,7 +145,7 @@ class SignInObserver : public content::WebContentsObserver { // Overridden from content::WebContentsObserver: virtual void DidNavigateMainFrame( const content::LoadCommittedDetails& details, - const content::FrameNavigateParams& params) OVERRIDE { + const content::FrameNavigateParams& params) override { if (IsSimilarUrl(params.url, cloud_print_url_)) { base::MessageLoop::current()->PostTask( FROM_HERE, @@ -154,7 +154,7 @@ class SignInObserver : public content::WebContentsObserver { } } - virtual void WebContentsDestroyed() OVERRIDE { + virtual void WebContentsDestroyed() override { delete this; } diff --git a/chrome/browser/printing/print_dialog_cloud_internal.h b/chrome/browser/printing/print_dialog_cloud_internal.h index d33ba05..e904113 100644 --- a/chrome/browser/printing/print_dialog_cloud_internal.h +++ b/chrome/browser/printing/print_dialog_cloud_internal.h @@ -102,12 +102,12 @@ class CloudPrintFlowHandler : public content::WebUIMessageHandler, virtual ~CloudPrintFlowHandler(); // WebUIMessageHandler implementation. - virtual void RegisterMessages() OVERRIDE; + virtual void RegisterMessages() override; // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Callbacks from the page. void HandleShowDebugger(const base::ListValue* args); @@ -155,19 +155,19 @@ class CloudPrintWebDialogDelegate : public ui::WebDialogDelegate { virtual ~CloudPrintWebDialogDelegate(); // ui::WebDialogDelegate implementation: - virtual ui::ModalType GetDialogModalType() const OVERRIDE; - virtual base::string16 GetDialogTitle() const OVERRIDE; - virtual GURL GetDialogContentURL() const OVERRIDE; + virtual ui::ModalType GetDialogModalType() const override; + virtual base::string16 GetDialogTitle() const override; + virtual GURL GetDialogContentURL() const override; virtual void GetWebUIMessageHandlers( - std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; - virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; - virtual std::string GetDialogArgs() const OVERRIDE; - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const override; + virtual void GetDialogSize(gfx::Size* size) const override; + virtual std::string GetDialogArgs() const override; + virtual void OnDialogClosed(const std::string& json_retval) override; virtual void OnCloseContents(content::WebContents* source, - bool* out_close_dialog) OVERRIDE; - virtual bool ShouldShowDialogTitle() const OVERRIDE; + bool* out_close_dialog) override; + virtual bool ShouldShowDialogTitle() const override; virtual bool HandleContextMenu( - const content::ContextMenuParams& params) OVERRIDE; + const content::ContextMenuParams& params) override; private: friend class ::CloudPrintWebDialogDelegateTest; diff --git a/chrome/browser/printing/print_job.h b/chrome/browser/printing/print_job.h index fa2498b..3a6af61 100644 --- a/chrome/browser/printing/print_job.h +++ b/chrome/browser/printing/print_job.h @@ -51,14 +51,14 @@ class PrintJob : public PrintJobWorkerOwner, // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // PrintJobWorkerOwner implementation. virtual void GetSettingsDone(const PrintSettings& new_settings, - PrintingContext::Result result) OVERRIDE; - virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) OVERRIDE; - virtual const PrintSettings& settings() const OVERRIDE; - virtual int cookie() const OVERRIDE; + PrintingContext::Result result) override; + virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) override; + virtual const PrintSettings& settings() const override; + virtual int cookie() const override; // Starts the actual printing. Signals the worker that it should begin to // spool as soon as data is available. diff --git a/chrome/browser/printing/print_job_manager.h b/chrome/browser/printing/print_job_manager.h index ef61541..32d5b30 100644 --- a/chrome/browser/printing/print_job_manager.h +++ b/chrome/browser/printing/print_job_manager.h @@ -66,7 +66,7 @@ class PrintJobManager : public content::NotificationObserver { // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Returns queries queue. Never returns NULL. Must be called on Browser UI // Thread. Reference could be stored and used from any thread. diff --git a/chrome/browser/printing/print_job_unittest.cc b/chrome/browser/printing/print_job_unittest.cc index 12a3dd9..118c4b1 100644 --- a/chrome/browser/printing/print_job_unittest.cc +++ b/chrome/browser/printing/print_job_unittest.cc @@ -19,7 +19,7 @@ namespace { class TestSource : public printing::PrintedPagesSource { public: - virtual base::string16 RenderSourceName() OVERRIDE { + virtual base::string16 RenderSourceName() override { return base::string16(); } }; @@ -37,11 +37,11 @@ class TestOwner : public printing::PrintJobWorkerOwner { public: virtual void GetSettingsDone( const printing::PrintSettings& new_settings, - printing::PrintingContext::Result result) OVERRIDE { + printing::PrintingContext::Result result) override { EXPECT_FALSE(true); } virtual printing::PrintJobWorker* DetachWorker( - printing::PrintJobWorkerOwner* new_owner) OVERRIDE { + printing::PrintJobWorkerOwner* new_owner) override { // We're screwing up here since we're calling worker from the main thread. // That's fine for testing. It is actually simulating PrinterQuery behavior. TestPrintJobWorker* worker(new TestPrintJobWorker(new_owner)); @@ -50,10 +50,10 @@ class TestOwner : public printing::PrintJobWorkerOwner { settings_ = worker->printing_context()->settings(); return worker; } - virtual const printing::PrintSettings& settings() const OVERRIDE { + virtual const printing::PrintSettings& settings() const override { return settings_; } - virtual int cookie() const OVERRIDE { + virtual int cookie() const override { return 42; } @@ -79,7 +79,7 @@ class TestPrintNotifObserv : public content::NotificationObserver { // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + const content::NotificationDetails& details) override { ADD_FAILURE(); } }; diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc index 5e3c59c..2313d6a 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -41,8 +41,8 @@ class PrintingContextDelegate : public PrintingContext::Delegate { PrintingContextDelegate(int render_process_id, int render_view_id); virtual ~PrintingContextDelegate(); - virtual gfx::NativeView GetParentView() OVERRIDE; - virtual std::string GetAppLocale() OVERRIDE; + virtual gfx::NativeView GetParentView() override; + virtual std::string GetAppLocale() override; private: int render_process_id_; diff --git a/chrome/browser/printing/print_preview_context_menu_observer.h b/chrome/browser/printing/print_preview_context_menu_observer.h index 8c05e53..aaf10fd 100644 --- a/chrome/browser/printing/print_preview_context_menu_observer.h +++ b/chrome/browser/printing/print_preview_context_menu_observer.h @@ -19,8 +19,8 @@ class PrintPreviewContextMenuObserver : public RenderViewContextMenuObserver { virtual ~PrintPreviewContextMenuObserver(); // RenderViewContextMenuObserver implementation. - virtual bool IsCommandIdSupported(int command_id) OVERRIDE; - virtual bool IsCommandIdEnabled(int command_id) OVERRIDE; + virtual bool IsCommandIdSupported(int command_id) override; + virtual bool IsCommandIdEnabled(int command_id) override; private: bool IsPrintPreviewDialog(); diff --git a/chrome/browser/printing/print_preview_dialog_controller.cc b/chrome/browser/printing/print_preview_dialog_controller.cc index aac04bc..3f3e94f 100644 --- a/chrome/browser/printing/print_preview_dialog_controller.cc +++ b/chrome/browser/printing/print_preview_dialog_controller.cc @@ -71,17 +71,17 @@ class PrintPreviewDialogDelegate : public ui::WebDialogDelegate { explicit PrintPreviewDialogDelegate(WebContents* initiator); virtual ~PrintPreviewDialogDelegate(); - virtual ui::ModalType GetDialogModalType() const OVERRIDE; - virtual base::string16 GetDialogTitle() const OVERRIDE; - virtual GURL GetDialogContentURL() const OVERRIDE; + virtual ui::ModalType GetDialogModalType() const override; + virtual base::string16 GetDialogTitle() const override; + virtual GURL GetDialogContentURL() const override; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; - virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; - virtual std::string GetDialogArgs() const OVERRIDE; - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; + std::vector<WebUIMessageHandler*>* handlers) const override; + virtual void GetDialogSize(gfx::Size* size) const override; + virtual std::string GetDialogArgs() const override; + virtual void OnDialogClosed(const std::string& json_retval) override; virtual void OnCloseContents(WebContents* source, - bool* out_close_dialog) OVERRIDE; - virtual bool ShouldShowDialogTitle() const OVERRIDE; + bool* out_close_dialog) override; + virtual bool ShouldShowDialogTitle() const override; private: WebContents* initiator_; diff --git a/chrome/browser/printing/print_preview_dialog_controller.h b/chrome/browser/printing/print_preview_dialog_controller.h index 50e8872..ecd2ead 100644 --- a/chrome/browser/printing/print_preview_dialog_controller.h +++ b/chrome/browser/printing/print_preview_dialog_controller.h @@ -64,7 +64,7 @@ class PrintPreviewDialogController // 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 |contents| is a print preview dialog. static bool IsPrintPreviewDialog(content::WebContents* contents); diff --git a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc index 232ee1a..4871112 100644 --- a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc +++ b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc @@ -33,7 +33,7 @@ class RequestPrintPreviewObserver : public WebContentsObserver { private: // content::WebContentsObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { IPC_BEGIN_MESSAGE_MAP(RequestPrintPreviewObserver, message) IPC_MESSAGE_HANDLER(PrintHostMsg_RequestPrintPreview, OnRequestPrintPreview) @@ -67,7 +67,7 @@ class PrintPreviewDialogClonedObserver : public WebContentsObserver { // content::WebContentsObserver implementation. virtual void DidCloneToNewWebContents( WebContents* old_web_contents, - WebContents* new_web_contents) OVERRIDE { + WebContents* new_web_contents) override { request_preview_dialog_observer_.reset( new RequestPrintPreviewObserver(new_web_contents)); } @@ -89,7 +89,7 @@ class PrintPreviewDialogDestroyedObserver : public WebContentsObserver { private: // content::WebContentsObserver implementation. - virtual void WebContentsDestroyed() OVERRIDE { + virtual void WebContentsDestroyed() override { dialog_destroyed_ = true; } @@ -121,7 +121,7 @@ class PrintPreviewDialogControllerBrowserTest : public InProcessBrowserTest { } private: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { WebContents* first_tab = browser()->tab_strip_model()->GetActiveWebContents(); ASSERT_TRUE(first_tab); @@ -139,7 +139,7 @@ class PrintPreviewDialogControllerBrowserTest : public InProcessBrowserTest { ASSERT_NE(first_tab, initiator_); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { cloned_tab_observer_.reset(); initiator_ = NULL; } diff --git a/chrome/browser/printing/print_preview_message_handler.h b/chrome/browser/printing/print_preview_message_handler.h index 5ea1884..ad72e87 100644 --- a/chrome/browser/printing/print_preview_message_handler.h +++ b/chrome/browser/printing/print_preview_message_handler.h @@ -36,7 +36,7 @@ class PrintPreviewMessageHandler virtual ~PrintPreviewMessageHandler(); // content::WebContentsObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: explicit PrintPreviewMessageHandler(content::WebContents* web_contents); diff --git a/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc b/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc index 6220288..bd93dc2 100644 --- a/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc +++ b/chrome/browser/printing/print_preview_pdf_generated_browsertest.cc @@ -130,7 +130,7 @@ class PrintPreviewObserver : public WebContentsObserver { base::MessageLoop::current()->PostTask(FROM_HERE, quit_closure_); } - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { IPC_BEGIN_MESSAGE_MAP(PrintPreviewObserver, message) IPC_MESSAGE_HANDLER(PrintHostMsg_DidGetPreviewPageCount, OnDidGetPreviewPageCount) @@ -242,7 +242,7 @@ class PrintPreviewObserver : public WebContentsObserver { // successfully set and its effects have been finalized. // 'UIFailedLoadingForTest' is sent when the setting could not be set. This // causes the browser test to fail. - virtual void RegisterMessages() OVERRIDE { + virtual void RegisterMessages() override { web_ui()->RegisterMessageCallback( "UILoadedForTest", base::Bind(&UIDoneLoadingMessageHandler::HandleDone, @@ -279,7 +279,7 @@ class PrintPreviewObserver : public WebContentsObserver { virtual void DidCloneToNewWebContents( WebContents* old_web_contents, - WebContents* new_web_contents) OVERRIDE { + WebContents* new_web_contents) override { Observe(new_web_contents); } diff --git a/chrome/browser/printing/print_preview_test.cc b/chrome/browser/printing/print_preview_test.cc index 130df6d..1ebfd13 100644 --- a/chrome/browser/printing/print_preview_test.cc +++ b/chrome/browser/printing/print_preview_test.cc @@ -26,7 +26,7 @@ class PrintPreviewTestBrowserWindow PrintPreviewTestBrowserWindow() {} // BrowserWindow overrides - virtual WebContentsModalDialogHost* GetWebContentsModalDialogHost() OVERRIDE { + virtual WebContentsModalDialogHost* GetWebContentsModalDialogHost() override { return this; } @@ -34,23 +34,23 @@ class PrintPreviewTestBrowserWindow // The web contents modal dialog must be parented to *something*; use the // WebContents window since there is no true browser window for unit tests. - virtual gfx::NativeView GetHostView() const OVERRIDE { + virtual gfx::NativeView GetHostView() const override { return FindBrowser()->tab_strip_model()->GetActiveWebContents()-> GetNativeView(); } - virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE { + virtual gfx::Point GetDialogPosition(const gfx::Size& size) override { return gfx::Point(); } - virtual gfx::Size GetMaximumDialogSize() OVERRIDE { + virtual gfx::Size GetMaximumDialogSize() override { return gfx::Size(); } virtual void AddObserver( - ModalDialogHostObserver* observer) OVERRIDE {} + ModalDialogHostObserver* observer) override {} virtual void RemoveObserver( - ModalDialogHostObserver* observer) OVERRIDE {} + ModalDialogHostObserver* observer) override {} private: Browser* FindBrowser() const { diff --git a/chrome/browser/printing/print_preview_test.h b/chrome/browser/printing/print_preview_test.h index ddfee0e..1932c875 100644 --- a/chrome/browser/printing/print_preview_test.h +++ b/chrome/browser/printing/print_preview_test.h @@ -13,10 +13,10 @@ class PrintPreviewTest : public BrowserWithTestWindowTest { virtual ~PrintPreviewTest(); protected: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; // Create a browser window to provide parenting for web contents modal dialog. - virtual BrowserWindow* CreateBrowserWindow() OVERRIDE; + virtual BrowserWindow* CreateBrowserWindow() override; private: DISALLOW_COPY_AND_ASSIGN(PrintPreviewTest); diff --git a/chrome/browser/printing/print_view_manager.h b/chrome/browser/printing/print_view_manager.h index d07299b..c1b12cc 100644 --- a/chrome/browser/printing/print_view_manager.h +++ b/chrome/browser/printing/print_view_manager.h @@ -53,11 +53,11 @@ class PrintViewManager : public PrintViewManagerBase, void set_observer(PrintViewManagerObserver* observer); // content::WebContentsObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // content::WebContentsObserver implementation. // Terminates or cancels the print job if one was pending. - virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; + virtual void RenderProcessGone(base::TerminationStatus status) override; private: explicit PrintViewManager(content::WebContents* web_contents); diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h index 3de5a46..7e1cee5 100644 --- a/chrome/browser/printing/print_view_manager_base.h +++ b/chrome/browser/printing/print_view_manager_base.h @@ -46,7 +46,7 @@ class PrintViewManagerBase : public content::NotificationObserver, void UpdateScriptedPrintingBlocked(); // PrintedPagesSource implementation. - virtual base::string16 RenderSourceName() OVERRIDE; + virtual base::string16 RenderSourceName() override; protected: explicit PrintViewManagerBase(content::WebContents* web_contents); @@ -55,10 +55,10 @@ class PrintViewManagerBase : public content::NotificationObserver, bool PrintNowInternal(IPC::Message* message); // Terminates or cancels the print job if one was pending. - virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; + virtual void RenderProcessGone(base::TerminationStatus status) override; // content::WebContentsObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // IPC Message handlers. virtual void OnPrintingFailed(int cookie); @@ -67,14 +67,14 @@ class PrintViewManagerBase : 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; // content::WebContentsObserver implementation. virtual void DidStartLoading( - content::RenderViewHost* render_view_host) OVERRIDE; + content::RenderViewHost* render_view_host) override; // Cancels the print job. - virtual void NavigationStopped() OVERRIDE; + virtual void NavigationStopped() override; // IPC Message handlers. void OnDidGetPrintedPagesCount(int cookie, int number_pages); diff --git a/chrome/browser/printing/print_view_manager_basic.h b/chrome/browser/printing/print_view_manager_basic.h index 0e40384..553c555 100644 --- a/chrome/browser/printing/print_view_manager_basic.h +++ b/chrome/browser/printing/print_view_manager_basic.h @@ -32,10 +32,10 @@ class PrintViewManagerBasic // content::WebContentsObserver implementation. // Terminates or cancels the print job if one was pending. - virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; + virtual void RenderProcessGone(base::TerminationStatus status) override; // content::WebContentsObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; #endif private: @@ -43,7 +43,7 @@ class PrintViewManagerBasic friend class content::WebContentsUserData<PrintViewManagerBasic>; #if defined(OS_ANDROID) - virtual void OnPrintingFailed(int cookie) OVERRIDE; + virtual void OnPrintingFailed(int cookie) override; // The file descriptor into which the PDF of the page will be written. base::FileDescriptor file_descriptor_; diff --git a/chrome/browser/printing/printer_query.h b/chrome/browser/printing/printer_query.h index 22af08d..9fd9a82 100644 --- a/chrome/browser/printing/printer_query.h +++ b/chrome/browser/printing/printer_query.h @@ -33,10 +33,10 @@ class PrinterQuery : public PrintJobWorkerOwner { // PrintJobWorkerOwner implementation. virtual void GetSettingsDone(const PrintSettings& new_settings, - PrintingContext::Result result) OVERRIDE; - virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) OVERRIDE; - virtual const PrintSettings& settings() const OVERRIDE; - virtual int cookie() const OVERRIDE; + PrintingContext::Result result) override; + virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) override; + virtual const PrintSettings& settings() const override; + virtual int cookie() const override; // Initializes the printing context. It is fine to call this function multiple // times to reinitialize the settings. |web_contents_observer| can be queried diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc index 632d65e..cc593ba 100644 --- a/chrome/browser/printing/printing_layout_browsertest.cc +++ b/chrome/browser/printing/printing_layout_browsertest.cc @@ -45,18 +45,18 @@ class PrintingLayoutTest : public PrintingTest<InProcessBrowserTest>, emf_path_ = browser_directory.AppendASCII("metafile_dumps"); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Make sure there is no left overs. CleanupDumpDirectory(); InProcessBrowserTest::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { InProcessBrowserTest::TearDown(); base::DeleteFile(emf_path_, true); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitchPath(switches::kDebugPrint, emf_path_); } diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h index 551fb7d..b160cce 100644 --- a/chrome/browser/printing/printing_message_filter.h +++ b/chrome/browser/printing/printing_message_filter.h @@ -42,8 +42,8 @@ class PrintingMessageFilter : public content::BrowserMessageFilter { // content::BrowserMessageFilter methods. virtual void OverrideThreadForMessage( const IPC::Message& message, - content::BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + content::BrowserThread::ID* thread) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: virtual ~PrintingMessageFilter(); diff --git a/chrome/browser/process_singleton_browsertest.cc b/chrome/browser/process_singleton_browsertest.cc index ad09a1c..4a682a2 100644 --- a/chrome/browser/process_singleton_browsertest.cc +++ b/chrome/browser/process_singleton_browsertest.cc @@ -169,7 +169,7 @@ class ProcessSingletonTest : public InProcessBrowserTest { explicit ProcessTreeFilter(base::ProcessId parent_pid) { ancestor_pids_.insert(parent_pid); } - virtual bool Includes(const base::ProcessEntry & entry) const OVERRIDE { + virtual bool Includes(const base::ProcessEntry & entry) const override { if (ancestor_pids_.find(entry.parent_pid()) != ancestor_pids_.end()) { ancestor_pids_.insert(entry.pid()); return true; diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc index 5592476..254aed3 100644 --- a/chrome/browser/process_singleton_posix.cc +++ b/chrome/browser/process_singleton_posix.cc @@ -491,8 +491,8 @@ class ProcessSingleton::LinuxWatcher } // MessageLoopForIO::Watcher impl. - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE { + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int fd) override { // SocketReader only watches for accept (read) events. NOTREACHED(); } @@ -550,14 +550,14 @@ class ProcessSingleton::LinuxWatcher SocketReader* reader); // MessageLoopForIO::Watcher impl. These run on the IO thread. - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE { + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int fd) override { // ProcessSingleton only watches for accept (read) events. NOTREACHED(); } // MessageLoop::DestructionObserver - virtual void WillDestroyCurrentMessageLoop() OVERRIDE { + virtual void WillDestroyCurrentMessageLoop() override { fd_watcher_.StopWatchingFileDescriptor(); } diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter.h b/chrome/browser/profile_resetter/automatic_profile_resetter.h index 9db561e..015fdc5 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter.h +++ b/chrome/browser/profile_resetter/automatic_profile_resetter.h @@ -139,7 +139,7 @@ class AutomaticProfileResetter : public KeyedService { const scoped_refptr<base::TaskRunner>& task_runner); // KeyedService: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; private: class InputBuilder; diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h index 015c466..44ca4c0 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h +++ b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h @@ -134,35 +134,35 @@ class AutomaticProfileResetterDelegateImpl } // AutomaticProfileResetterDelegate: - virtual void EnumerateLoadedModulesIfNeeded() OVERRIDE; + virtual void EnumerateLoadedModulesIfNeeded() override; virtual void RequestCallbackWhenLoadedModulesAreEnumerated( - const base::Closure& ready_callback) const OVERRIDE; - virtual void LoadTemplateURLServiceIfNeeded() OVERRIDE; + const base::Closure& ready_callback) const override; + virtual void LoadTemplateURLServiceIfNeeded() override; virtual void RequestCallbackWhenTemplateURLServiceIsLoaded( - const base::Closure& ready_callback) const OVERRIDE; - virtual void FetchBrandcodedDefaultSettingsIfNeeded() OVERRIDE; + const base::Closure& ready_callback) const override; + virtual void FetchBrandcodedDefaultSettingsIfNeeded() override; virtual void RequestCallbackWhenBrandcodedDefaultsAreFetched( - const base::Closure& ready_callback) const OVERRIDE; + const base::Closure& ready_callback) const override; virtual scoped_ptr<base::ListValue> - GetLoadedModuleNameDigests() const OVERRIDE; + GetLoadedModuleNameDigests() const override; virtual scoped_ptr<base::DictionaryValue> - GetDefaultSearchProviderDetails() const OVERRIDE; - virtual bool IsDefaultSearchProviderManaged() const OVERRIDE; + GetDefaultSearchProviderDetails() const override; + virtual bool IsDefaultSearchProviderManaged() const override; virtual scoped_ptr<base::ListValue> - GetPrepopulatedSearchProvidersDetails() const OVERRIDE; - virtual bool TriggerPrompt() OVERRIDE; + GetPrepopulatedSearchProvidersDetails() const override; + virtual bool TriggerPrompt() override; virtual void TriggerProfileSettingsReset( bool send_feedback, - const base::Closure& completion) OVERRIDE; - virtual void DismissPrompt() OVERRIDE; + const base::Closure& completion) override; + virtual void DismissPrompt() override; // TemplateURLServiceObserver: - virtual void OnTemplateURLServiceChanged() OVERRIDE; + virtual void OnTemplateURLServiceChanged() override; // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: // Sends a feedback |report|, where |report| is supposed to be result of diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc index 560b277..db4ec93 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc +++ b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc @@ -167,7 +167,7 @@ class AutomaticProfileResetterDelegateTest AutomaticProfileResetterDelegateTest() {} virtual ~AutomaticProfileResetterDelegateTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { extensions::ExtensionServiceTestBase::SetUp(); ExtensionServiceInitParams params = CreateDefaultInitParams(); params.pref_file.clear(); // Prescribes a TestingPrefService to be created. @@ -178,7 +178,7 @@ class AutomaticProfileResetterDelegateTest new AutomaticProfileResetterDelegateUnderTest(profile())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { resetter_delegate_.reset(); template_url_service_test_util_.reset(); extensions::ExtensionServiceTestBase::TearDown(); diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_factory.h b/chrome/browser/profile_resetter/automatic_profile_resetter_factory.h index ddd3777..251f4c75 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter_factory.h +++ b/chrome/browser/profile_resetter/automatic_profile_resetter_factory.h @@ -41,13 +41,13 @@ class AutomaticProfileResetterFactory // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; // BrowserContextKeyedBaseFactory: virtual void RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + user_prefs::PrefRegistrySyncable* registry) override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; DISALLOW_COPY_AND_ASSIGN(AutomaticProfileResetterFactory); }; diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc index ad6ed03..5ffb24c 100644 --- a/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc +++ b/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc @@ -100,26 +100,26 @@ class MockProfileResetterDelegate : public AutomaticProfileResetterDelegate { MOCK_METHOD0(DismissPrompt, void()); virtual scoped_ptr<base::ListValue> - GetLoadedModuleNameDigests() const OVERRIDE { + GetLoadedModuleNameDigests() const override { OnGetLoadedModuleNameDigestsCalled(); return scoped_ptr<base::ListValue>( emulated_loaded_module_digests_.DeepCopy()); } virtual scoped_ptr<base::DictionaryValue> - GetDefaultSearchProviderDetails() const OVERRIDE { + GetDefaultSearchProviderDetails() const override { OnGetDefaultSearchProviderDetailsCalled(); return scoped_ptr<base::DictionaryValue>( emulated_default_search_provider_details_.DeepCopy()); } - virtual bool IsDefaultSearchProviderManaged() const OVERRIDE { + virtual bool IsDefaultSearchProviderManaged() const override { OnIsDefaultSearchProviderManagedCalled(); return emulated_is_default_search_provider_managed_; } virtual scoped_ptr<base::ListValue> - GetPrepopulatedSearchProvidersDetails() const OVERRIDE { + GetPrepopulatedSearchProvidersDetails() const override { OnGetPrepopulatedSearchProvidersDetailsCalled(); return scoped_ptr<base::ListValue>( emulated_search_providers_details_.DeepCopy()); @@ -515,7 +515,7 @@ class AutomaticProfileResetterTestBase : public testing::Test { user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { variations::testing::ClearAllVariationParams(); base::FieldTrialList::CreateFieldTrial(kAutomaticProfileResetStudyName, experiment_group_name_); diff --git a/chrome/browser/profile_resetter/brandcode_config_fetcher.h b/chrome/browser/profile_resetter/brandcode_config_fetcher.h index bbb5631..643abe4 100644 --- a/chrome/browser/profile_resetter/brandcode_config_fetcher.h +++ b/chrome/browser/profile_resetter/brandcode_config_fetcher.h @@ -35,7 +35,7 @@ class BrandcodeConfigFetcher : public net::URLFetcherDelegate { private: // net::URLFetcherDelegate: - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; void OnDownloadTimeout(); diff --git a/chrome/browser/profile_resetter/jtl_interpreter.cc b/chrome/browser/profile_resetter/jtl_interpreter.cc index e258078..daca3e6 100644 --- a/chrome/browser/profile_resetter/jtl_interpreter.cc +++ b/chrome/browser/profile_resetter/jtl_interpreter.cc @@ -113,7 +113,7 @@ class NavigateOperation : public Operation { explicit NavigateOperation(const std::string& hashed_key) : hashed_key_(hashed_key) {} virtual ~NavigateOperation() {} - virtual bool Execute(ExecutionContext* context) OVERRIDE { + virtual bool Execute(ExecutionContext* context) override { const base::DictionaryValue* dict = NULL; if (!context->current_node()->GetAsDictionary(&dict)) { // Just ignore this node gracefully as this navigation is a dead end. @@ -143,7 +143,7 @@ class NavigateAnyOperation : public Operation { public: NavigateAnyOperation() {} virtual ~NavigateAnyOperation() {} - virtual bool Execute(ExecutionContext* context) OVERRIDE { + virtual bool Execute(ExecutionContext* context) override { const base::DictionaryValue* dict = NULL; const base::ListValue* list = NULL; if (context->current_node()->GetAsDictionary(&dict)) { @@ -178,7 +178,7 @@ class NavigateBackOperation : public Operation { public: NavigateBackOperation() {} virtual ~NavigateBackOperation() {} - virtual bool Execute(ExecutionContext* context) OVERRIDE { + virtual bool Execute(ExecutionContext* context) override { const base::Value* current_node = context->current_node(); context->stack()->pop_back(); bool continue_traversal = context->ContinueExecution(); @@ -199,7 +199,7 @@ class StoreValue : public Operation { DCHECK(value_); } virtual ~StoreValue() {} - virtual bool Execute(ExecutionContext* context) OVERRIDE { + virtual bool Execute(ExecutionContext* context) override { context->working_memory()->Set(hashed_name_, value_->DeepCopy()); return context->ContinueExecution(); } @@ -223,7 +223,7 @@ class CompareStoredValue : public Operation { DCHECK(default_value_); } virtual ~CompareStoredValue() {} - virtual bool Execute(ExecutionContext* context) OVERRIDE { + virtual bool Execute(ExecutionContext* context) override { const base::Value* actual_value = NULL; if (!context->working_memory()->Get(hashed_name_, &actual_value)) actual_value = default_value_.get(); @@ -247,7 +247,7 @@ class StoreNodeValue : public Operation { DCHECK(base::IsStringUTF8(hashed_name)); } virtual ~StoreNodeValue() {} - virtual bool Execute(ExecutionContext* context) OVERRIDE { + virtual bool Execute(ExecutionContext* context) override { scoped_ptr<base::Value> value; if (ExpectedTypeIsBooleanNotHashable) { if (!context->current_node()->IsType(base::Value::TYPE_BOOLEAN)) @@ -278,7 +278,7 @@ class StoreNodeRegisterableDomain : public Operation { DCHECK(base::IsStringUTF8(hashed_name)); } virtual ~StoreNodeRegisterableDomain() {} - virtual bool Execute(ExecutionContext* context) OVERRIDE { + virtual bool Execute(ExecutionContext* context) override { std::string possibly_invalid_url; std::string domain; if (!context->current_node()->GetAsString(&possibly_invalid_url) || @@ -327,7 +327,7 @@ class CompareNodeBool : public Operation { public: explicit CompareNodeBool(bool value) : value_(value) {} virtual ~CompareNodeBool() {} - virtual bool Execute(ExecutionContext* context) OVERRIDE { + virtual bool Execute(ExecutionContext* context) override { bool actual_value = false; if (!context->current_node()->GetAsBoolean(&actual_value)) return true; @@ -346,7 +346,7 @@ class CompareNodeHash : public Operation { explicit CompareNodeHash(const std::string& hashed_value) : hashed_value_(hashed_value) {} virtual ~CompareNodeHash() {} - virtual bool Execute(ExecutionContext* context) OVERRIDE { + virtual bool Execute(ExecutionContext* context) override { std::string actual_hash; if (!context->GetValueHash(*context->current_node(), &actual_hash) || actual_hash != hashed_value_) @@ -364,7 +364,7 @@ class CompareNodeHashNot : public Operation { explicit CompareNodeHashNot(const std::string& hashed_value) : hashed_value_(hashed_value) {} virtual ~CompareNodeHashNot() {} - virtual bool Execute(ExecutionContext* context) OVERRIDE { + virtual bool Execute(ExecutionContext* context) override { std::string actual_hash; if (context->GetValueHash(*context->current_node(), &actual_hash) && actual_hash == hashed_value_) @@ -383,7 +383,7 @@ class CompareNodeToStored : public Operation { explicit CompareNodeToStored(const std::string& hashed_name) : hashed_name_(hashed_name) {} virtual ~CompareNodeToStored() {} - virtual bool Execute(ExecutionContext* context) OVERRIDE { + virtual bool Execute(ExecutionContext* context) override { const base::Value* stored_value = NULL; if (!context->working_memory()->Get(hashed_name_, &stored_value)) return true; @@ -418,7 +418,7 @@ class CompareNodeSubstring : public Operation { DCHECK(pattern_length_); } virtual ~CompareNodeSubstring() {} - virtual bool Execute(ExecutionContext* context) OVERRIDE { + virtual bool Execute(ExecutionContext* context) override { std::string value_as_string; if (!context->current_node()->GetAsString(&value_as_string) || !pattern_length_ || value_as_string.size() < pattern_length_) @@ -451,7 +451,7 @@ class StopExecutingSentenceOperation : public Operation { public: StopExecutingSentenceOperation() {} virtual ~StopExecutingSentenceOperation() {} - virtual bool Execute(ExecutionContext* context) OVERRIDE { + virtual bool Execute(ExecutionContext* context) override { return false; } diff --git a/chrome/browser/profile_resetter/profile_reset_global_error.h b/chrome/browser/profile_resetter/profile_reset_global_error.h index 6529df49..11afd27 100644 --- a/chrome/browser/profile_resetter/profile_reset_global_error.h +++ b/chrome/browser/profile_resetter/profile_reset_global_error.h @@ -39,14 +39,14 @@ class ProfileResetGlobalError void OnBubbleViewNoThanksButtonPressed(); // 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; private: Profile* profile_; diff --git a/chrome/browser/profile_resetter/profile_resetter.h b/chrome/browser/profile_resetter/profile_resetter.h index 595aa5e..7ea117b 100644 --- a/chrome/browser/profile_resetter/profile_resetter.h +++ b/chrome/browser/profile_resetter/profile_resetter.h @@ -84,7 +84,7 @@ class ProfileResetter : public base::NonThreadSafe, void ResetShortcuts(); // BrowsingDataRemover::Observer: - virtual void OnBrowsingDataRemoverDone() OVERRIDE; + virtual void OnBrowsingDataRemoverDone() override; // Callback for when TemplateURLService has loaded. void OnTemplateURLServiceLoaded(); diff --git a/chrome/browser/profile_resetter/profile_resetter_browsertest.cc b/chrome/browser/profile_resetter/profile_resetter_browsertest.cc index c820743..e7df126 100644 --- a/chrome/browser/profile_resetter/profile_resetter_browsertest.cc +++ b/chrome/browser/profile_resetter/profile_resetter_browsertest.cc @@ -155,7 +155,7 @@ void RemoveCookieTester::Notify() { class ProfileResetTest : public InProcessBrowserTest, public ProfileResetterTestBase { protected: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { resetter_.reset(new ProfileResetter(browser()->profile())); } }; diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc index cbaf232..62dc99c 100644 --- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc +++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc @@ -103,7 +103,7 @@ class ProfileResetterTest : public extensions::ExtensionServiceTestBase, virtual ~ProfileResetterTest(); protected: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; TestingProfile* profile() { return profile_.get(); } @@ -161,7 +161,7 @@ KeyedService* ProfileResetterTest::CreateTemplateURLService( class PinnedTabsResetTest : public BrowserWithTestWindowTest, public ProfileResetterTestBase { protected: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; content::WebContents* CreateWebContents(); }; @@ -184,7 +184,7 @@ struct URLFetcherRequestListener : net::URLFetcherDelegate { URLFetcherRequestListener(); virtual ~URLFetcherRequestListener(); - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; std::string upload_data; net::URLFetcherDelegate* real_delegate; diff --git a/chrome/browser/profiles/avatar_menu.h b/chrome/browser/profiles/avatar_menu.h index 781bdf4..1bdf2ae 100644 --- a/chrome/browser/profiles/avatar_menu.h +++ b/chrome/browser/profiles/avatar_menu.h @@ -149,12 +149,12 @@ class AvatarMenu : // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: #if defined(ENABLE_MANAGED_USERS) // SupervisedUserServiceObserver: - virtual void OnCustodianInfoChanged() OVERRIDE; + virtual void OnCustodianInfoChanged() override; #endif // The model that provides the list of menu items. diff --git a/chrome/browser/profiles/avatar_menu_actions_desktop.h b/chrome/browser/profiles/avatar_menu_actions_desktop.h index e3a2078..031923f 100644 --- a/chrome/browser/profiles/avatar_menu_actions_desktop.h +++ b/chrome/browser/profiles/avatar_menu_actions_desktop.h @@ -19,11 +19,11 @@ class AvatarMenuActionsDesktop : public AvatarMenuActions { virtual ~AvatarMenuActionsDesktop(); // AvatarMenuActions overrides: - virtual void AddNewProfile(ProfileMetrics::ProfileAdd type) OVERRIDE; - virtual void EditProfile(Profile* profile, size_t index) OVERRIDE; - virtual bool ShouldShowAddNewProfileLink() const OVERRIDE; - virtual bool ShouldShowEditProfileLink() const OVERRIDE; - virtual void ActiveBrowserChanged(Browser* browser) OVERRIDE; + virtual void AddNewProfile(ProfileMetrics::ProfileAdd type) override; + virtual void EditProfile(Profile* profile, size_t index) override; + virtual bool ShouldShowAddNewProfileLink() const override; + virtual bool ShouldShowEditProfileLink() const override; + virtual void ActiveBrowserChanged(Browser* browser) override; private: // Browser in which this avatar menu resides. Weak. diff --git a/chrome/browser/profiles/bookmark_model_loaded_observer.h b/chrome/browser/profiles/bookmark_model_loaded_observer.h index 3b1c3e2..49b6722 100644 --- a/chrome/browser/profiles/bookmark_model_loaded_observer.h +++ b/chrome/browser/profiles/bookmark_model_loaded_observer.h @@ -16,10 +16,10 @@ class BookmarkModelLoadedObserver : public BaseBookmarkModelObserver { explicit BookmarkModelLoadedObserver(Profile* profile); private: - virtual void BookmarkModelChanged() OVERRIDE; + virtual void BookmarkModelChanged() override; 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; Profile* profile_; diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h index 8e9c80e..3120ae5 100644 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h @@ -26,7 +26,7 @@ class ChromeBrowserMainExtraPartsProfiles : public ChromeBrowserMainExtraParts { static void EnsureBrowserContextKeyedServiceFactoriesBuilt(); // Overridden from ChromeBrowserMainExtraParts: - virtual void PreProfileInit() OVERRIDE; + virtual void PreProfileInit() override; private: DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsProfiles); diff --git a/chrome/browser/profiles/gaia_info_update_service.h b/chrome/browser/profiles/gaia_info_update_service.h index edb699a..4e5c997 100644 --- a/chrome/browser/profiles/gaia_info_update_service.h +++ b/chrome/browser/profiles/gaia_info_update_service.h @@ -33,17 +33,17 @@ class GAIAInfoUpdateService : public KeyedService, static bool ShouldUseGAIAProfileInfo(Profile* profile); // ProfileDownloaderDelegate: - virtual bool NeedsProfilePicture() const OVERRIDE; - virtual int GetDesiredImageSideLength() const OVERRIDE; - virtual Profile* GetBrowserProfile() OVERRIDE; - virtual std::string GetCachedPictureURL() const OVERRIDE; - virtual void OnProfileDownloadSuccess(ProfileDownloader* downloader) OVERRIDE; + virtual bool NeedsProfilePicture() const override; + virtual int GetDesiredImageSideLength() const override; + virtual Profile* GetBrowserProfile() override; + virtual std::string GetCachedPictureURL() const override; + virtual void OnProfileDownloadSuccess(ProfileDownloader* downloader) override; virtual void OnProfileDownloadFailure( ProfileDownloader* downloader, - ProfileDownloaderDelegate::FailureReason reason) OVERRIDE; + ProfileDownloaderDelegate::FailureReason reason) override; // Overridden from KeyedService: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; private: FRIEND_TEST_ALL_PREFIXES(GAIAInfoUpdateServiceTest, ScheduleUpdate); @@ -54,9 +54,9 @@ class GAIAInfoUpdateService : public KeyedService, // Overridden from SigninManagerBase::Observer: virtual void GoogleSigninSucceeded(const std::string& account_id, const std::string& username, - const std::string& password) OVERRIDE; + const std::string& password) override; virtual void GoogleSignedOut(const std::string& account_id, - const std::string& username) OVERRIDE; + const std::string& username) override; Profile* profile_; scoped_ptr<ProfileDownloader> profile_image_downloader_; diff --git a/chrome/browser/profiles/gaia_info_update_service_factory.h b/chrome/browser/profiles/gaia_info_update_service_factory.h index 304e9e8..e594c49 100644 --- a/chrome/browser/profiles/gaia_info_update_service_factory.h +++ b/chrome/browser/profiles/gaia_info_update_service_factory.h @@ -36,11 +36,11 @@ class GAIAInfoUpdateServiceFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual void RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + user_prefs::PrefRegistrySyncable* registry) override; + virtual bool ServiceIsNULLWhileTesting() const override; DISALLOW_COPY_AND_ASSIGN(GAIAInfoUpdateServiceFactory); }; diff --git a/chrome/browser/profiles/gaia_info_update_service_unittest.cc b/chrome/browser/profiles/gaia_info_update_service_unittest.cc index e5ffa2c..b4554847 100644 --- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc +++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc @@ -135,8 +135,8 @@ class GAIAInfoUpdateServiceTest : public ProfileInfoCacheTest { } private: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; Profile* profile_; scoped_ptr<NiceMock<GAIAInfoUpdateServiceMock> > service_; diff --git a/chrome/browser/profiles/host_zoom_map_browsertest.cc b/chrome/browser/profiles/host_zoom_map_browsertest.cc index e14a579..6c779dd 100644 --- a/chrome/browser/profiles/host_zoom_map_browsertest.cc +++ b/chrome/browser/profiles/host_zoom_map_browsertest.cc @@ -127,7 +127,7 @@ class HostZoomMapBrowserTest : public InProcessBrowserTest { } // BrowserTestBase: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); embedded_test_server()->RegisterRequestHandler(base::Bind( &HostZoomMapBrowserTest::HandleRequest, base::Unretained(this))); @@ -143,7 +143,7 @@ class HostZoomMapSanitizationBrowserTest : public HostZoomMapBrowserTest { private: // InProcessBrowserTest: - virtual bool SetUpUserDataDirectory() OVERRIDE { + virtual bool SetUpUserDataDirectory() override { // Zoom-related preferences demonstrating the two problems that could be // caused by the bug. They incorrectly contain a per-host zoom level for the // empty host; and a value for 'host1' that only differs from the default by diff --git a/chrome/browser/profiles/incognito_mode_policy_handler.h b/chrome/browser/profiles/incognito_mode_policy_handler.h index 6aa8c7e..9f09b6d 100644 --- a/chrome/browser/profiles/incognito_mode_policy_handler.h +++ b/chrome/browser/profiles/incognito_mode_policy_handler.h @@ -26,9 +26,9 @@ class IncognitoModePolicyHandler : public ConfigurationPolicyHandler { // ConfigurationPolicyHandler methods: virtual bool CheckPolicySettings(const PolicyMap& policies, - PolicyErrorMap* errors) OVERRIDE; + PolicyErrorMap* errors) override; virtual void ApplyPolicySettings(const PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; private: DISALLOW_COPY_AND_ASSIGN(IncognitoModePolicyHandler); diff --git a/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc b/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc index 91ed0fe..9ca0653 100644 --- a/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc +++ b/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc @@ -15,7 +15,7 @@ namespace policy { class IncognitoModePolicyHandlerTest : public ConfigurationPolicyPrefStoreTest { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { handler_list_.AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( new IncognitoModePolicyHandler)); } diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index 4df068d..ad2fb05 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc @@ -493,11 +493,11 @@ class GuestSessionProfile : public OffTheRecordProfileImpl { : OffTheRecordProfileImpl(real_profile) { } - virtual ProfileType GetProfileType() const OVERRIDE { + virtual ProfileType GetProfileType() const override { return GUEST_PROFILE; } - virtual void InitChromeOSPreferences() OVERRIDE { + virtual void InitChromeOSPreferences() override { chromeos_preferences_.reset(new chromeos::Preferences()); chromeos_preferences_->Init( this, user_manager::UserManager::Get()->GetActiveUser()); diff --git a/chrome/browser/profiles/off_the_record_profile_impl.h b/chrome/browser/profiles/off_the_record_profile_impl.h index 750d5193..c367409 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.h +++ b/chrome/browser/profiles/off_the_record_profile_impl.h @@ -36,76 +36,76 @@ class OffTheRecordProfileImpl : public Profile { void Init(); // Profile implementation. - virtual std::string GetProfileName() OVERRIDE; - virtual ProfileType GetProfileType() const OVERRIDE; - virtual Profile* GetOffTheRecordProfile() OVERRIDE; - virtual void DestroyOffTheRecordProfile() OVERRIDE; - virtual bool HasOffTheRecordProfile() OVERRIDE; - virtual Profile* GetOriginalProfile() OVERRIDE; - virtual bool IsSupervised() OVERRIDE; + virtual std::string GetProfileName() override; + virtual ProfileType GetProfileType() const override; + virtual Profile* GetOffTheRecordProfile() override; + virtual void DestroyOffTheRecordProfile() override; + virtual bool HasOffTheRecordProfile() override; + virtual Profile* GetOriginalProfile() override; + virtual bool IsSupervised() override; virtual ExtensionSpecialStoragePolicy* - GetExtensionSpecialStoragePolicy() OVERRIDE; - virtual PrefService* GetPrefs() OVERRIDE; - virtual PrefService* GetOffTheRecordPrefs() OVERRIDE; + GetExtensionSpecialStoragePolicy() override; + virtual PrefService* GetPrefs() override; + virtual PrefService* GetOffTheRecordPrefs() override; virtual net::URLRequestContextGetter* - GetRequestContextForExtensions() OVERRIDE; + GetRequestContextForExtensions() override; virtual net::URLRequestContextGetter* CreateRequestContext( content::ProtocolHandlerMap* protocol_handlers, - content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE; + content::URLRequestInterceptorScopedVector request_interceptors) override; virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition( const base::FilePath& partition_path, bool in_memory, content::ProtocolHandlerMap* protocol_handlers, - content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE; - virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE; - virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE; - virtual bool IsSameProfile(Profile* profile) OVERRIDE; - virtual Time GetStartTime() const OVERRIDE; - virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE; - virtual history::TopSites* GetTopSites() OVERRIDE; - virtual base::FilePath last_selected_directory() OVERRIDE; - virtual void set_last_selected_directory(const base::FilePath& path) OVERRIDE; - virtual bool WasCreatedByVersionOrLater(const std::string& version) OVERRIDE; - virtual void SetExitType(ExitType exit_type) OVERRIDE; - virtual ExitType GetLastSessionExitType() OVERRIDE; + content::URLRequestInterceptorScopedVector request_interceptors) override; + virtual net::SSLConfigService* GetSSLConfigService() override; + virtual HostContentSettingsMap* GetHostContentSettingsMap() override; + virtual bool IsSameProfile(Profile* profile) override; + virtual Time GetStartTime() const override; + virtual history::TopSites* GetTopSitesWithoutCreating() override; + virtual history::TopSites* GetTopSites() override; + virtual base::FilePath last_selected_directory() override; + virtual void set_last_selected_directory(const base::FilePath& path) override; + virtual bool WasCreatedByVersionOrLater(const std::string& version) override; + virtual void SetExitType(ExitType exit_type) override; + virtual ExitType GetLastSessionExitType() override; #if defined(OS_CHROMEOS) virtual void ChangeAppLocale(const std::string& locale, - AppLocaleChangedVia) OVERRIDE; - virtual void OnLogin() OVERRIDE; - virtual void InitChromeOSPreferences() OVERRIDE; + AppLocaleChangedVia) override; + virtual void OnLogin() override; + virtual void InitChromeOSPreferences() override; #endif // defined(OS_CHROMEOS) - virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE; + virtual PrefProxyConfigTracker* GetProxyConfigTracker() override; - virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE; - virtual DevToolsNetworkController* GetDevToolsNetworkController() OVERRIDE; + virtual chrome_browser_net::Predictor* GetNetworkPredictor() override; + virtual DevToolsNetworkController* GetDevToolsNetworkController() override; virtual void ClearNetworkingHistorySince( base::Time time, - const base::Closure& completion) OVERRIDE; - virtual GURL GetHomePage() OVERRIDE; + const base::Closure& completion) override; + virtual GURL GetHomePage() override; // content::BrowserContext implementation: - virtual base::FilePath GetPath() const OVERRIDE; - virtual scoped_refptr<base::SequencedTaskRunner> GetIOTaskRunner() OVERRIDE; - virtual bool IsOffTheRecord() const OVERRIDE; + virtual base::FilePath GetPath() const override; + virtual scoped_refptr<base::SequencedTaskRunner> GetIOTaskRunner() override; + virtual bool IsOffTheRecord() const override; virtual content::DownloadManagerDelegate* - GetDownloadManagerDelegate() OVERRIDE; - virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE; + GetDownloadManagerDelegate() override; + virtual net::URLRequestContextGetter* GetRequestContext() override; virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess( - int renderer_child_id) OVERRIDE; - virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE; + int renderer_child_id) override; + virtual net::URLRequestContextGetter* GetMediaRequestContext() override; virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess( - int renderer_child_id) OVERRIDE; + int renderer_child_id) override; virtual net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition( const base::FilePath& partition_path, - bool in_memory) OVERRIDE; - virtual content::ResourceContext* GetResourceContext() OVERRIDE; - virtual content::BrowserPluginGuestManager* GetGuestManager() OVERRIDE; - virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE; - virtual content::PushMessagingService* GetPushMessagingService() OVERRIDE; - virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() OVERRIDE; + bool in_memory) override; + virtual content::ResourceContext* GetResourceContext() override; + virtual content::BrowserPluginGuestManager* GetGuestManager() override; + virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override; + virtual content::PushMessagingService* GetPushMessagingService() override; + virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() override; private: FRIEND_TEST_ALL_PREFIXES(OffTheRecordProfileImplTest, GetHostZoomMap); diff --git a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc index 62a7978..521bc75b 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc @@ -37,7 +37,7 @@ class TestingProfileWithHostZoomMap : public TestingProfile { virtual ~TestingProfileWithHostZoomMap() {} // Profile overrides: - virtual PrefService* GetOffTheRecordPrefs() OVERRIDE { + virtual PrefService* GetOffTheRecordPrefs() override { return GetPrefs(); } @@ -77,7 +77,7 @@ class OffTheRecordProfileImplTest : public BrowserWithTestWindowTest { virtual ~OffTheRecordProfileImplTest() {} // testing::Test overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { profile_manager_.reset(new TestingProfileManager(browser_process())); ASSERT_TRUE(profile_manager_->SetUp()); @@ -88,7 +88,7 @@ class OffTheRecordProfileImplTest : public BrowserWithTestWindowTest { BrowserWithTestWindowTest::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { BrowserWithTestWindowTest::TearDown(); testing_io_thread_state_.reset(); @@ -97,7 +97,7 @@ class OffTheRecordProfileImplTest : public BrowserWithTestWindowTest { } // BrowserWithTestWindowTest overrides: - virtual TestingProfile* CreateProfile() OVERRIDE { + virtual TestingProfile* CreateProfile() override { return new TestingProfileWithHostZoomMap; } diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.h b/chrome/browser/profiles/off_the_record_profile_io_data.h index 1917916..7014006 100644 --- a/chrome/browser/profiles/off_the_record_profile_io_data.h +++ b/chrome/browser/profiles/off_the_record_profile_io_data.h @@ -113,9 +113,9 @@ class OffTheRecordProfileIOData : public ProfileIOData { ProfileParams* profile_params, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptors) - const OVERRIDE; + const override; virtual void InitializeExtensionsRequestContext( - ProfileParams* profile_params) const OVERRIDE; + ProfileParams* profile_params) const override; virtual net::URLRequestContext* InitializeAppRequestContext( net::URLRequestContext* main_context, const StoragePartitionDescriptor& partition_descriptor, @@ -123,12 +123,12 @@ class OffTheRecordProfileIOData : public ProfileIOData { protocol_handler_interceptor, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptors) - const OVERRIDE; + const override; virtual net::URLRequestContext* InitializeMediaRequestContext( net::URLRequestContext* original_context, - const StoragePartitionDescriptor& partition_descriptor) const OVERRIDE; + const StoragePartitionDescriptor& partition_descriptor) const override; virtual net::URLRequestContext* - AcquireMediaRequestContext() const OVERRIDE; + AcquireMediaRequestContext() const override; virtual net::URLRequestContext* AcquireIsolatedAppRequestContext( net::URLRequestContext* main_context, const StoragePartitionDescriptor& partition_descriptor, @@ -136,12 +136,12 @@ class OffTheRecordProfileIOData : public ProfileIOData { protocol_handler_interceptor, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptors) - const OVERRIDE; + const override; virtual net::URLRequestContext* AcquireIsolatedMediaRequestContext( net::URLRequestContext* app_context, const StoragePartitionDescriptor& partition_descriptor) - const OVERRIDE; + const override; mutable scoped_ptr<net::HttpTransactionFactory> main_http_factory_; mutable scoped_ptr<net::FtpTransactionFactory> ftp_factory_; diff --git a/chrome/browser/profiles/profile_avatar_downloader.h b/chrome/browser/profiles/profile_avatar_downloader.h index e7b8867..7825ccc 100644 --- a/chrome/browser/profiles/profile_avatar_downloader.h +++ b/chrome/browser/profiles/profile_avatar_downloader.h @@ -19,7 +19,7 @@ class ProfileAvatarDownloader : public chrome::BitmapFetcherDelegate { void Start(); // BitmapFetcherDelegate: - virtual void OnFetchComplete(const GURL url, const SkBitmap* bitmap) OVERRIDE; + virtual void OnFetchComplete(const GURL url, const SkBitmap* bitmap) override; private: // Downloads the avatar image from a url. diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc index 25b2579..d413cf6 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc @@ -60,7 +60,7 @@ class AvatarImageSource : public gfx::CanvasImageSource { virtual ~AvatarImageSource(); // CanvasImageSource override: - virtual void Draw(gfx::Canvas* canvas) OVERRIDE; + virtual void Draw(gfx::Canvas* canvas) override; private: gfx::ImageSkia avatar_; diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc index 1213ff3..40e5282 100644 --- a/chrome/browser/profiles/profile_browsertest.cc +++ b/chrome/browser/profiles/profile_browsertest.cc @@ -93,7 +93,7 @@ void SpinThreads() { class ProfileBrowserTest : public InProcessBrowserTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { #if defined(OS_CHROMEOS) command_line->AppendSwitch( chromeos::switches::kIgnoreUserProfileMappingForTests); diff --git a/chrome/browser/profiles/profile_destroyer.h b/chrome/browser/profiles/profile_destroyer.h index 566992e..cd5054f 100644 --- a/chrome/browser/profiles/profile_destroyer.h +++ b/chrome/browser/profiles/profile_destroyer.h @@ -35,7 +35,7 @@ class ProfileDestroyer : public content::RenderProcessHostObserver { // content::RenderProcessHostObserver override. virtual void RenderProcessHostDestroyed( - content::RenderProcessHost* host) OVERRIDE; + content::RenderProcessHost* host) override; // Called by the timer to cancel the pending destruction and do it now. void DestroyProfile(); diff --git a/chrome/browser/profiles/profile_destroyer_unittest.cc b/chrome/browser/profiles/profile_destroyer_unittest.cc index 4976584..d401041 100644 --- a/chrome/browser/profiles/profile_destroyer_unittest.cc +++ b/chrome/browser/profiles/profile_destroyer_unittest.cc @@ -21,7 +21,7 @@ class TestingOffTheRecordDestructionProfile : public TestingProfile { destroyed_otr_profile_(false) { set_incognito(true); } - virtual void DestroyOffTheRecordProfile() OVERRIDE { + virtual void DestroyOffTheRecordProfile() override { destroyed_otr_profile_ = true; } bool destroyed_otr_profile_; @@ -39,7 +39,7 @@ class TestingOriginalDestructionProfile : public TestingProfile { DCHECK_EQ(this, living_instance_); living_instance_ = NULL; } - virtual void DestroyOffTheRecordProfile() OVERRIDE { + virtual void DestroyOffTheRecordProfile() override { SetOffTheRecordProfile(NULL); destroyed_otr_profile_ = true; } @@ -62,7 +62,7 @@ class ProfileDestroyerTest : public BrowserWithTestWindowTest { ProfileDestroyerTest() : off_the_record_profile_(NULL) {} protected: - virtual TestingProfile* CreateProfile() OVERRIDE { + virtual TestingProfile* CreateProfile() override { if (off_the_record_profile_ == NULL) off_the_record_profile_ = new TestingOffTheRecordDestructionProfile(); return off_the_record_profile_; diff --git a/chrome/browser/profiles/profile_downloader.h b/chrome/browser/profiles/profile_downloader.h index 8d78c97..3a62938 100644 --- a/chrome/browser/profiles/profile_downloader.h +++ b/chrome/browser/profiles/profile_downloader.h @@ -87,27 +87,27 @@ class ProfileDownloader : public gaia::GaiaOAuthClient::Delegate, // gaia::GaiaOAuthClient::Delegate implementation. virtual void OnGetUserInfoResponse( - scoped_ptr<base::DictionaryValue> user_info) OVERRIDE; - virtual void OnOAuthError() OVERRIDE; - virtual void OnNetworkError(int response_code) OVERRIDE; + scoped_ptr<base::DictionaryValue> user_info) override; + virtual void OnOAuthError() override; + virtual void OnNetworkError(int response_code) override; // Overriden from net::URLFetcherDelegate: - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; // Overriden from ImageDecoder::Delegate: virtual void OnImageDecoded(const ImageDecoder* decoder, - const SkBitmap& decoded_image) OVERRIDE; - virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE; + const SkBitmap& decoded_image) override; + virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override; // Overriden from OAuth2TokenService::Observer: - virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE; + virtual void OnRefreshTokenAvailable(const std::string& account_id) override; // Overriden from OAuth2TokenService::Consumer: 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; // Parses the entry response and gets the name, profile image URL and locale. // |data| should be the JSON formatted data return by the response. diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h index 6545b38..ae08755 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h @@ -75,77 +75,77 @@ class ProfileImpl : public Profile { static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); // content::BrowserContext implementation: - virtual base::FilePath GetPath() const OVERRIDE; + virtual base::FilePath GetPath() const override; virtual content::DownloadManagerDelegate* - GetDownloadManagerDelegate() OVERRIDE; - virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE; + GetDownloadManagerDelegate() override; + virtual net::URLRequestContextGetter* GetRequestContext() override; virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess( - int renderer_child_id) OVERRIDE; - virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE; + int renderer_child_id) override; + virtual net::URLRequestContextGetter* GetMediaRequestContext() override; virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess( - int renderer_child_id) OVERRIDE; + int renderer_child_id) override; virtual net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition( const base::FilePath& partition_path, - bool in_memory) OVERRIDE; - virtual content::ResourceContext* GetResourceContext() OVERRIDE; - virtual content::BrowserPluginGuestManager* GetGuestManager() OVERRIDE; - virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE; - virtual content::PushMessagingService* GetPushMessagingService() OVERRIDE; - virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() OVERRIDE; + bool in_memory) override; + virtual content::ResourceContext* GetResourceContext() override; + virtual content::BrowserPluginGuestManager* GetGuestManager() override; + virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override; + virtual content::PushMessagingService* GetPushMessagingService() override; + virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() override; // Profile implementation: - virtual scoped_refptr<base::SequencedTaskRunner> GetIOTaskRunner() OVERRIDE; + virtual scoped_refptr<base::SequencedTaskRunner> GetIOTaskRunner() override; // Note that this implementation returns the Google-services username, if any, // not the Chrome user's display name. - virtual std::string GetProfileName() OVERRIDE; - virtual ProfileType GetProfileType() const OVERRIDE; - virtual bool IsOffTheRecord() const OVERRIDE; - virtual Profile* GetOffTheRecordProfile() OVERRIDE; - virtual void DestroyOffTheRecordProfile() OVERRIDE; - virtual bool HasOffTheRecordProfile() OVERRIDE; - virtual Profile* GetOriginalProfile() OVERRIDE; - virtual bool IsSupervised() OVERRIDE; - virtual history::TopSites* GetTopSites() OVERRIDE; - virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE; + virtual std::string GetProfileName() override; + virtual ProfileType GetProfileType() const override; + virtual bool IsOffTheRecord() const override; + virtual Profile* GetOffTheRecordProfile() override; + virtual void DestroyOffTheRecordProfile() override; + virtual bool HasOffTheRecordProfile() override; + virtual Profile* GetOriginalProfile() override; + virtual bool IsSupervised() override; + virtual history::TopSites* GetTopSites() override; + virtual history::TopSites* GetTopSitesWithoutCreating() override; virtual ExtensionSpecialStoragePolicy* - GetExtensionSpecialStoragePolicy() OVERRIDE; - virtual PrefService* GetPrefs() OVERRIDE; - virtual PrefService* GetOffTheRecordPrefs() OVERRIDE; + GetExtensionSpecialStoragePolicy() override; + virtual PrefService* GetPrefs() override; + virtual PrefService* GetOffTheRecordPrefs() override; virtual net::URLRequestContextGetter* - GetRequestContextForExtensions() OVERRIDE; - virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE; - virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE; - virtual bool IsSameProfile(Profile* profile) OVERRIDE; - virtual base::Time GetStartTime() const OVERRIDE; + GetRequestContextForExtensions() override; + virtual net::SSLConfigService* GetSSLConfigService() override; + virtual HostContentSettingsMap* GetHostContentSettingsMap() override; + virtual bool IsSameProfile(Profile* profile) override; + virtual base::Time GetStartTime() const override; virtual net::URLRequestContextGetter* CreateRequestContext( content::ProtocolHandlerMap* protocol_handlers, - content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE; + content::URLRequestInterceptorScopedVector request_interceptors) override; virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition( const base::FilePath& partition_path, bool in_memory, content::ProtocolHandlerMap* protocol_handlers, - content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE; - virtual base::FilePath last_selected_directory() OVERRIDE; - virtual void set_last_selected_directory(const base::FilePath& path) OVERRIDE; - virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE; - virtual DevToolsNetworkController* GetDevToolsNetworkController() OVERRIDE; + content::URLRequestInterceptorScopedVector request_interceptors) override; + virtual base::FilePath last_selected_directory() override; + virtual void set_last_selected_directory(const base::FilePath& path) override; + virtual chrome_browser_net::Predictor* GetNetworkPredictor() override; + virtual DevToolsNetworkController* GetDevToolsNetworkController() override; virtual void ClearNetworkingHistorySince( base::Time time, - const base::Closure& completion) OVERRIDE; - virtual GURL GetHomePage() OVERRIDE; - virtual bool WasCreatedByVersionOrLater(const std::string& version) OVERRIDE; - virtual void SetExitType(ExitType exit_type) OVERRIDE; - virtual ExitType GetLastSessionExitType() OVERRIDE; + const base::Closure& completion) override; + virtual GURL GetHomePage() override; + virtual bool WasCreatedByVersionOrLater(const std::string& version) override; + virtual void SetExitType(ExitType exit_type) override; + virtual ExitType GetLastSessionExitType() override; #if defined(OS_CHROMEOS) virtual void ChangeAppLocale(const std::string& locale, - AppLocaleChangedVia) OVERRIDE; - virtual void OnLogin() OVERRIDE; - virtual void InitChromeOSPreferences() OVERRIDE; + AppLocaleChangedVia) override; + virtual void OnLogin() override; + virtual void InitChromeOSPreferences() override; #endif // defined(OS_CHROMEOS) - virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE; + virtual PrefProxyConfigTracker* GetProxyConfigTracker() override; private: #if defined(OS_CHROMEOS) diff --git a/chrome/browser/profiles/profile_impl_io_data.h b/chrome/browser/profiles/profile_impl_io_data.h index a660f51..21c72ab 100644 --- a/chrome/browser/profiles/profile_impl_io_data.h +++ b/chrome/browser/profiles/profile_impl_io_data.h @@ -176,9 +176,9 @@ class ProfileImplIOData : public ProfileIOData { ProfileParams* profile_params, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptors) - const OVERRIDE; + const override; virtual void InitializeExtensionsRequestContext( - ProfileParams* profile_params) const OVERRIDE; + ProfileParams* profile_params) const override; virtual net::URLRequestContext* InitializeAppRequestContext( net::URLRequestContext* main_context, const StoragePartitionDescriptor& partition_descriptor, @@ -186,12 +186,12 @@ class ProfileImplIOData : public ProfileIOData { protocol_handler_interceptor, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptors) - const OVERRIDE; + const override; virtual net::URLRequestContext* InitializeMediaRequestContext( net::URLRequestContext* original_context, - const StoragePartitionDescriptor& partition_descriptor) const OVERRIDE; + const StoragePartitionDescriptor& partition_descriptor) const override; virtual net::URLRequestContext* - AcquireMediaRequestContext() const OVERRIDE; + AcquireMediaRequestContext() const override; virtual net::URLRequestContext* AcquireIsolatedAppRequestContext( net::URLRequestContext* main_context, const StoragePartitionDescriptor& partition_descriptor, @@ -199,12 +199,12 @@ class ProfileImplIOData : public ProfileIOData { protocol_handler_interceptor, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptors) - const OVERRIDE; + const override; virtual net::URLRequestContext* AcquireIsolatedMediaRequestContext( net::URLRequestContext* app_context, const StoragePartitionDescriptor& partition_descriptor) - const OVERRIDE; + const override; // Deletes all network related data since |time|. It deletes transport // security state since |time| and also deletes HttpServerProperties data. diff --git a/chrome/browser/profiles/profile_info_cache.h b/chrome/browser/profiles/profile_info_cache.h index 1572427..ead90eb 100644 --- a/chrome/browser/profiles/profile_info_cache.h +++ b/chrome/browser/profiles/profile_info_cache.h @@ -52,46 +52,46 @@ class ProfileInfoCache : public ProfileInfoInterface, void DeleteProfileFromCache(const base::FilePath& profile_path); // ProfileInfoInterface: - virtual size_t GetNumberOfProfiles() const OVERRIDE; + virtual size_t GetNumberOfProfiles() const override; // Don't cache this value and reuse, because resorting the menu could cause // the item being referred to to change out from under you. virtual size_t GetIndexOfProfileWithPath( - const base::FilePath& profile_path) const OVERRIDE; - virtual base::string16 GetNameOfProfileAtIndex(size_t index) const OVERRIDE; + const base::FilePath& profile_path) const override; + virtual base::string16 GetNameOfProfileAtIndex(size_t index) const override; virtual base::string16 GetShortcutNameOfProfileAtIndex(size_t index) - const OVERRIDE; - virtual base::FilePath GetPathOfProfileAtIndex(size_t index) const OVERRIDE; - virtual base::Time GetProfileActiveTimeAtIndex(size_t index) const OVERRIDE; + const override; + virtual base::FilePath GetPathOfProfileAtIndex(size_t index) const override; + virtual base::Time GetProfileActiveTimeAtIndex(size_t index) const override; virtual base::string16 GetUserNameOfProfileAtIndex( - size_t index) const OVERRIDE; + size_t index) const override; virtual const gfx::Image& GetAvatarIconOfProfileAtIndex( - size_t index) const OVERRIDE; + size_t index) const override; virtual std::string GetLocalAuthCredentialsOfProfileAtIndex( - size_t index) const OVERRIDE; + size_t index) const override; // Note that a return value of false could mean an error in collection or // that there are currently no background apps running. However, the action // which results is the same in both cases (thus far). virtual bool GetBackgroundStatusOfProfileAtIndex( - size_t index) const OVERRIDE; + size_t index) const override; virtual base::string16 GetGAIANameOfProfileAtIndex( - size_t index) const OVERRIDE; + size_t index) const override; virtual base::string16 GetGAIAGivenNameOfProfileAtIndex( - size_t index) const OVERRIDE; + size_t index) const override; // Returns the GAIA picture for the given profile. This may return NULL // if the profile does not have a GAIA picture or if the picture must be // loaded from disk. virtual const gfx::Image* GetGAIAPictureOfProfileAtIndex( - size_t index) const OVERRIDE; + size_t index) const override; virtual bool IsUsingGAIAPictureOfProfileAtIndex( - size_t index) const OVERRIDE; - virtual bool ProfileIsSupervisedAtIndex(size_t index) const OVERRIDE; - virtual bool IsOmittedProfileAtIndex(size_t index) const OVERRIDE; - virtual bool ProfileIsSigninRequiredAtIndex(size_t index) const OVERRIDE; + size_t index) const override; + virtual bool ProfileIsSupervisedAtIndex(size_t index) const override; + virtual bool IsOmittedProfileAtIndex(size_t index) const override; + virtual bool ProfileIsSigninRequiredAtIndex(size_t index) const override; virtual std::string GetSupervisedUserIdOfProfileAtIndex(size_t index) const - OVERRIDE; - virtual bool ProfileIsEphemeralAtIndex(size_t index) const OVERRIDE; - virtual bool ProfileIsUsingDefaultNameAtIndex(size_t index) const OVERRIDE; - virtual bool ProfileIsUsingDefaultAvatarAtIndex(size_t index) const OVERRIDE; + override; + virtual bool ProfileIsEphemeralAtIndex(size_t index) const override; + virtual bool ProfileIsUsingDefaultNameAtIndex(size_t index) const override; + virtual bool ProfileIsUsingDefaultAvatarAtIndex(size_t index) const override; size_t GetAvatarIconIndexOfProfileAtIndex(size_t index) const; diff --git a/chrome/browser/profiles/profile_info_cache_unittest.h b/chrome/browser/profiles/profile_info_cache_unittest.h index 1f5ba8a..882e605 100644 --- a/chrome/browser/profiles/profile_info_cache_unittest.h +++ b/chrome/browser/profiles/profile_info_cache_unittest.h @@ -27,16 +27,16 @@ class ProfileNameVerifierObserver : public ProfileInfoCacheObserver { virtual ~ProfileNameVerifierObserver(); // ProfileInfoCacheObserver overrides: - virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE; + virtual void OnProfileAdded(const base::FilePath& profile_path) override; virtual void OnProfileWillBeRemoved( - const base::FilePath& profile_path) OVERRIDE; - virtual void OnProfileWasRemoved( - const base::FilePath& profile_path, - const base::string16& profile_name) OVERRIDE; + const base::FilePath& profile_path) override; + virtual void OnProfileWasRemoved(const base::FilePath& profile_path, + const base::string16& profile_name) override; virtual void OnProfileNameChanged( const base::FilePath& profile_path, - const base::string16& old_profile_name) OVERRIDE; - virtual void OnProfileAvatarChanged(const base::FilePath& profile_path) OVERRIDE; + const base::string16& old_profile_name) override; + virtual void OnProfileAvatarChanged( + const base::FilePath& profile_path) override; private: ProfileInfoCache* GetCache(); @@ -50,8 +50,8 @@ class ProfileInfoCacheTest : public testing::Test { ProfileInfoCacheTest(); virtual ~ProfileInfoCacheTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; ProfileInfoCache* GetCache(); base::FilePath GetProfilePath(const std::string& base_name); diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index b06f78c..9ba6a7d 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -213,7 +213,7 @@ class DebugDevToolsInterceptor : public net::URLRequestInterceptor { // net::URLRequestInterceptor implementation. virtual net::URLRequestJob* MaybeInterceptRequest( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { base::FilePath path; if (IsSupportedDevToolsURL(request->url(), &path)) return new net::URLRequestFileJob( diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h index 6bf1a30..f49e3e8 100644 --- a/chrome/browser/profiles/profile_io_data.h +++ b/chrome/browser/profiles/profile_io_data.h @@ -495,16 +495,16 @@ class ProfileIOData { virtual ~ResourceContext(); // ResourceContext implementation: - virtual net::HostResolver* GetHostResolver() OVERRIDE; - virtual net::URLRequestContext* GetRequestContext() OVERRIDE; - virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() OVERRIDE; + virtual net::HostResolver* GetHostResolver() override; + virtual net::URLRequestContext* GetRequestContext() override; + virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() override; virtual void CreateKeygenHandler( uint32 key_size_in_bits, const std::string& challenge_string, const GURL& url, const base::Callback<void(scoped_ptr<net::KeygenHandler>)>& callback) - OVERRIDE; - virtual SaltCallback GetMediaDeviceIDSalt() OVERRIDE; + override; + virtual SaltCallback GetMediaDeviceIDSalt() override; private: friend class ProfileIOData; diff --git a/chrome/browser/profiles/profile_list_desktop.h b/chrome/browser/profiles/profile_list_desktop.h index 91c2b8a..38d4354 100644 --- a/chrome/browser/profiles/profile_list_desktop.h +++ b/chrome/browser/profiles/profile_list_desktop.h @@ -21,14 +21,14 @@ class ProfileListDesktop : public ProfileList { virtual ~ProfileListDesktop(); // ProfileList overrides: - virtual size_t GetNumberOfItems() const OVERRIDE; - virtual const AvatarMenu::Item& GetItemAt(size_t index) const OVERRIDE; - virtual void RebuildMenu() OVERRIDE; + virtual size_t GetNumberOfItems() const override; + virtual const AvatarMenu::Item& GetItemAt(size_t index) const override; + virtual void RebuildMenu() override; // Returns the menu index of the profile at |index| in the ProfileInfoCache. // The profile index must exist, and it may not be marked as omitted from the // menu. - virtual size_t MenuIndexFromProfileIndex(size_t index) OVERRIDE; - virtual void ActiveProfilePathChanged(base::FilePath& path) OVERRIDE; + virtual size_t MenuIndexFromProfileIndex(size_t index) override; + virtual void ActiveProfilePathChanged(base::FilePath& path) override; private: void ClearMenu(); diff --git a/chrome/browser/profiles/profile_list_desktop_unittest.cc b/chrome/browser/profiles/profile_list_desktop_unittest.cc index fb7a9ec..97db42c 100644 --- a/chrome/browser/profiles/profile_list_desktop_unittest.cc +++ b/chrome/browser/profiles/profile_list_desktop_unittest.cc @@ -33,7 +33,7 @@ class MockObserver : public AvatarMenuObserver { virtual ~MockObserver() {} virtual void OnAvatarMenuChanged( - AvatarMenu* avatar_menu) OVERRIDE { + AvatarMenu* avatar_menu) override { ++count_; } diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h index cf7fb9a..efad19a 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h @@ -190,12 +190,12 @@ class ProfileManager : public base::NonThreadSafe, // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Profile::Delegate implementation: virtual void OnProfileCreated(Profile* profile, bool success, - bool is_new_profile) OVERRIDE; + bool is_new_profile) override; protected: // Does final initial actions. @@ -290,9 +290,9 @@ class ProfileManager : public base::NonThreadSafe, virtual ~BrowserListObserver(); // 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; private: ProfileManager* profile_manager_; @@ -359,8 +359,8 @@ class ProfileManagerWithoutInit : public ProfileManager { explicit ProfileManagerWithoutInit(const base::FilePath& user_data_dir); protected: - virtual void DoFinalInitForServices(Profile*, bool) OVERRIDE {} - virtual void DoFinalInitLogging(Profile*) OVERRIDE {} + virtual void DoFinalInitForServices(Profile*, bool) override {} + virtual void DoFinalInitLogging(Profile*) override {} }; #endif // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_ diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc index 38cdeb2..059c379 100644 --- a/chrome/browser/profiles/profile_manager_browsertest.cc +++ b/chrome/browser/profiles/profile_manager_browsertest.cc @@ -78,7 +78,7 @@ class ProfileRemovalObserver : public ProfileInfoCacheObserver { // ProfileInfoCacheObserver overrides: virtual void OnProfileWillBeRemoved( - const base::FilePath& profile_path) OVERRIDE { + const base::FilePath& profile_path) override { last_used_profile_name_ = g_browser_process->local_state()->GetString( prefs::kProfileLastUsed); } @@ -97,7 +97,7 @@ class PasswordStoreConsumerVerifier : PasswordStoreConsumerVerifier() : called_(false) {} virtual void OnGetPasswordStoreResults( - const std::vector<autofill::PasswordForm*>& results) OVERRIDE { + const std::vector<autofill::PasswordForm*>& results) override { EXPECT_FALSE(called_); called_ = true; password_entries_.clear(); @@ -123,7 +123,7 @@ class PasswordStoreConsumerVerifier : // platforms. class ProfileManagerBrowserTest : public InProcessBrowserTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { #if defined(OS_CHROMEOS) command_line->AppendSwitch( chromeos::switches::kIgnoreUserProfileMappingForTests); @@ -216,7 +216,7 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, DISABLED_DeleteAllProfiles) { class ProfileManagerCrOSBrowserTest : public ProfileManagerBrowserTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Use a user hash other than the default chrome::kTestUserProfileDir // so that the prefix case is tested. command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc index 45beab1..c965a6f 100644 --- a/chrome/browser/profiles/profile_manager_unittest.cc +++ b/chrome/browser/profiles/profile_manager_unittest.cc @@ -72,7 +72,7 @@ class UnittestProfileManager : public ::ProfileManagerWithoutInit { protected: virtual Profile* CreateProfileHelper( - const base::FilePath& file_path) OVERRIDE { + const base::FilePath& file_path) override { if (!base::PathExists(file_path)) { if (!base::CreateDirectory(file_path)) return NULL; @@ -81,7 +81,7 @@ class UnittestProfileManager : public ::ProfileManagerWithoutInit { } virtual Profile* CreateProfileAsyncHelper(const base::FilePath& path, - Delegate* delegate) OVERRIDE { + Delegate* delegate) override { // This is safe while all file operations are done on the FILE thread. BrowserThread::PostTask( BrowserThread::FILE, FROM_HERE, @@ -393,7 +393,7 @@ class UnittestGuestProfileManager : public UnittestProfileManager { protected: virtual Profile* CreateProfileHelper( - const base::FilePath& file_path) OVERRIDE { + const base::FilePath& file_path) override { TestingProfile::Builder builder; builder.SetGuestSession(); builder.SetPath(file_path); diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc index f846125..3d847eb 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc @@ -41,7 +41,7 @@ class ProfileShortcutManagerTest : public testing::Test { fake_system_desktop_(base::DIR_COMMON_DESKTOP) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CoInitialize(NULL); TestingBrowserProcess* browser_process = @@ -59,7 +59,7 @@ class ProfileShortcutManagerTest : public testing::Test { profile_3_path_ = CreateProfileDirectory(profile_3_name_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { message_loop_.RunUntilIdle(); // Delete all profiles and ensure their shortcuts got removed. diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.h b/chrome/browser/profiles/profile_shortcut_manager_win.h index 215178c..30e5349 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_win.h +++ b/chrome/browser/profiles/profile_shortcut_manager_win.h @@ -54,34 +54,34 @@ class ProfileShortcutManagerWin : public ProfileShortcutManager, // ProfileShortcutManager implementation: virtual void CreateOrUpdateProfileIcon( - const base::FilePath& profile_path) OVERRIDE; + const base::FilePath& profile_path) override; virtual void CreateProfileShortcut( - const base::FilePath& profile_path) OVERRIDE; + const base::FilePath& profile_path) override; virtual void RemoveProfileShortcuts( - const base::FilePath& profile_path) OVERRIDE; + const base::FilePath& profile_path) override; virtual void HasProfileShortcuts( const base::FilePath& profile_path, - const base::Callback<void(bool)>& callback) OVERRIDE; + const base::Callback<void(bool)>& callback) override; virtual void GetShortcutProperties(const base::FilePath& profile_path, base::CommandLine* command_line, base::string16* name, - base::FilePath* icon_path) OVERRIDE; + base::FilePath* icon_path) override; // ProfileInfoCacheObserver implementation: - virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE; + virtual void OnProfileAdded(const base::FilePath& profile_path) override; virtual void OnProfileWasRemoved( const base::FilePath& profile_path, - const base::string16& profile_name) OVERRIDE; + const base::string16& profile_name) override; virtual void OnProfileNameChanged( const base::FilePath& profile_path, - const base::string16& old_profile_name) OVERRIDE; + const base::string16& old_profile_name) override; virtual void OnProfileAvatarChanged( - const base::FilePath& profile_path) OVERRIDE; + const base::FilePath& profile_path) override; // content::NotificationObserver implementation: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; private: // Gives the profile path of an alternate profile than |profile_path|. diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc index 93524af..0fe8a0c 100644 --- a/chrome/browser/profiles/profile_window.cc +++ b/chrome/browser/profiles/profile_window.cc @@ -62,7 +62,7 @@ class BrowserAddedForProfileObserver : public chrome::BrowserListObserver { private: // Overridden from BrowserListObserver: - virtual void OnBrowserAdded(Browser* browser) OVERRIDE { + virtual void OnBrowserAdded(Browser* browser) override { if (browser->profile() == profile_) { BrowserList::RemoveObserver(this); callback_.Run(profile_, Profile::CREATE_STATUS_INITIALIZED); diff --git a/chrome/browser/profiles/startup_task_runner_service_factory.h b/chrome/browser/profiles/startup_task_runner_service_factory.h index a9defbe6..beddade 100644 --- a/chrome/browser/profiles/startup_task_runner_service_factory.h +++ b/chrome/browser/profiles/startup_task_runner_service_factory.h @@ -32,7 +32,7 @@ class StartupTaskRunnerServiceFactory // BrowserContextKeyedServiceFactory: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; DISALLOW_COPY_AND_ASSIGN(StartupTaskRunnerServiceFactory); }; |