diff options
author | mohan.reddy <mohan.reddy@samsung.com> | 2014-10-07 13:36:23 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 20:36:42 +0000 |
commit | 0da06d0ec798825e71e6da277a22e5121a91ab2b (patch) | |
tree | f6b014af6a8dee45797a4dc8ebf2507a502e7bbb /chrome/service/cloud_print | |
parent | 0e4545444b94c97bb82cf9e23f6b6d438d216ccb (diff) | |
download | chromium_src-0da06d0ec798825e71e6da277a22e5121a91ab2b.zip chromium_src-0da06d0ec798825e71e6da277a22e5121a91ab2b.tar.gz chromium_src-0da06d0ec798825e71e6da277a22e5121a91ab2b.tar.bz2 |
Replacing the OVERRIDE with override and FINAL with final in chrome/service
This step is a giant search and replace for OVERRIDE and FINAL to
replace them with their lowercase versions.
BUG=417463
Review URL: https://codereview.chromium.org/628083002
Cr-Commit-Position: refs/heads/master@{#298562}
Diffstat (limited to 'chrome/service/cloud_print')
14 files changed, 115 insertions, 115 deletions
diff --git a/chrome/service/cloud_print/cloud_print_auth.h b/chrome/service/cloud_print/cloud_print_auth.h index ccb3553..f78ecfc 100644 --- a/chrome/service/cloud_print/cloud_print_auth.h +++ b/chrome/service/cloud_print/cloud_print_auth.h @@ -58,20 +58,20 @@ class CloudPrintAuth // gaia::GaiaOAuthClient::Delegate implementation. virtual void OnGetTokensResponse(const std::string& refresh_token, const std::string& access_token, - int expires_in_seconds) OVERRIDE; + int expires_in_seconds) override; virtual void OnRefreshTokenResponse(const std::string& access_token, - int expires_in_seconds) OVERRIDE; - virtual void OnOAuthError() OVERRIDE; - virtual void OnNetworkError(int response_code) OVERRIDE; + int expires_in_seconds) override; + virtual void OnOAuthError() override; + virtual void OnNetworkError(int response_code) override; // CloudPrintURLFetcher::Delegate implementation. virtual CloudPrintURLFetcher::ResponseAction HandleJSONData( const net::URLFetcher* source, const GURL& url, base::DictionaryValue* json_data, - bool succeeded) OVERRIDE; - virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() OVERRIDE; - virtual std::string GetAuthHeader() OVERRIDE; + bool succeeded) override; + virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override; + virtual std::string GetAuthHeader() override; private: friend class base::RefCountedThreadSafe<CloudPrintAuth>; diff --git a/chrome/service/cloud_print/cloud_print_connector.h b/chrome/service/cloud_print/cloud_print_connector.h index 3ff77e7..52280af 100644 --- a/chrome/service/cloud_print/cloud_print_connector.h +++ b/chrome/service/cloud_print/cloud_print_connector.h @@ -85,23 +85,23 @@ class CloudPrintConnector virtual ~CloudPrintConnector(); // PrintServerWatcherDelegate implementation - virtual void OnPrinterAdded() OVERRIDE; + virtual void OnPrinterAdded() override; // PrinterJobHandler::Delegate implementation - virtual void OnPrinterDeleted(const std::string& printer_name) OVERRIDE; - virtual void OnAuthError() OVERRIDE; + virtual void OnPrinterDeleted(const std::string& printer_name) override; + virtual void OnAuthError() override; // CloudPrintURLFetcher::Delegate implementation. virtual CloudPrintURLFetcher::ResponseAction HandleRawData( const net::URLFetcher* source, const GURL& url, - const std::string& data) OVERRIDE; + const std::string& data) override; virtual CloudPrintURLFetcher::ResponseAction HandleJSONData( const net::URLFetcher* source, const GURL& url, base::DictionaryValue* json_data, - bool succeeded) OVERRIDE; - virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() OVERRIDE; - virtual std::string GetAuthHeader() OVERRIDE; + bool succeeded) override; + virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override; + virtual std::string GetAuthHeader() override; // Begin response handlers CloudPrintURLFetcher::ResponseAction HandlePrinterListResponse( diff --git a/chrome/service/cloud_print/cloud_print_proxy.h b/chrome/service/cloud_print/cloud_print_proxy.h index 3c6ddbb..7f839d1 100644 --- a/chrome/service/cloud_print/cloud_print_proxy.h +++ b/chrome/service/cloud_print/cloud_print_proxy.h @@ -64,16 +64,16 @@ class CloudPrintProxy : public CloudPrintProxyFrontend, // CloudPrintProxyFrontend implementation. Called on UI thread. virtual void OnAuthenticated(const std::string& robot_oauth_refresh_token, const std::string& robot_email, - const std::string& user_email) OVERRIDE; - virtual void OnAuthenticationFailed() OVERRIDE; - virtual void OnPrintSystemUnavailable() OVERRIDE; + const std::string& user_email) override; + virtual void OnAuthenticationFailed() override; + virtual void OnPrintSystemUnavailable() override; virtual void OnUnregisterPrinters( const std::string& auth_token, - const std::list<std::string>& printer_ids) OVERRIDE; - virtual void OnXmppPingUpdated(int ping_timeout) OVERRIDE; + const std::list<std::string>& printer_ids) override; + virtual void OnXmppPingUpdated(int ping_timeout) override; // CloudPrintWipeout::Client implementation. - virtual void OnUnregisterPrintersComplete() OVERRIDE; + virtual void OnUnregisterPrintersComplete() override; protected: void ShutdownBackend(); diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc index 20c7246..c4e6c6c 100644 --- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc +++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc @@ -69,20 +69,20 @@ class CloudPrintProxyBackend::Core const std::string& access_token, const std::string& robot_oauth_refresh_token, const std::string& robot_email, - const std::string& user_email) OVERRIDE; - virtual void OnInvalidCredentials() OVERRIDE; + const std::string& user_email) override; + virtual void OnInvalidCredentials() override; // CloudPrintConnector::Client implementation. - virtual void OnAuthFailed() OVERRIDE; - virtual void OnXmppPingUpdated(int ping_timeout) OVERRIDE; + virtual void OnAuthFailed() override; + virtual void OnXmppPingUpdated(int ping_timeout) override; // notifier::PushClientObserver implementation. - virtual void OnNotificationsEnabled() OVERRIDE; + virtual void OnNotificationsEnabled() override; virtual void OnNotificationsDisabled( - notifier::NotificationsDisabledReason reason) OVERRIDE; + notifier::NotificationsDisabledReason reason) override; virtual void OnIncomingNotification( - const notifier::Notification& notification) OVERRIDE; - virtual void OnPingResponse() OVERRIDE; + const notifier::Notification& notification) override; + virtual void OnPingResponse() override; private: friend class base::RefCountedThreadSafe<Core>; diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.h b/chrome/service/cloud_print/cloud_print_url_fetcher.h index d0ade54..901d584 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher.h +++ b/chrome/service/cloud_print/cloud_print_url_fetcher.h @@ -134,7 +134,7 @@ class CloudPrintURLFetcher const std::string& additional_headers); // net::URLFetcherDelegate implementation. - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; protected: CloudPrintURLFetcher(); diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc index 3f1a116..488f5be 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc +++ b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc @@ -38,7 +38,7 @@ class TrackingTestURLRequestContextGetter g_request_context_getter_instances++; } - virtual net::TestURLRequestContext* GetURLRequestContext() OVERRIDE { + virtual net::TestURLRequestContext* GetURLRequestContext() override { if (!context_.get()) { context_.reset(new net::TestURLRequestContext(true)); context_->set_throttler_manager(throttler_manager_); @@ -65,7 +65,7 @@ class TestCloudPrintURLFetcher : public CloudPrintURLFetcher { : io_message_loop_proxy_(io_message_loop_proxy) { } - virtual net::URLRequestContextGetter* GetRequestContextGetter() OVERRIDE { + virtual net::URLRequestContextGetter* GetRequestContextGetter() override { return new TrackingTestURLRequestContextGetter( io_message_loop_proxy_.get(), throttler_manager()); } @@ -99,14 +99,14 @@ class CloudPrintURLFetcherTest : public testing::Test, const net::URLRequestStatus& status, int response_code, const net::ResponseCookies& cookies, - const std::string& data) OVERRIDE; + const std::string& data) override; - virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() OVERRIDE { + virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override { ADD_FAILURE(); return CloudPrintURLFetcher::STOP_PROCESSING; } - virtual std::string GetAuthHeader() OVERRIDE { + virtual std::string GetAuthHeader() override { return std::string(); } @@ -152,18 +152,18 @@ class CloudPrintURLFetcherBasicTest : public CloudPrintURLFetcherTest { const net::URLRequestStatus& status, int response_code, const net::ResponseCookies& cookies, - const std::string& data) OVERRIDE; + const std::string& data) override; virtual CloudPrintURLFetcher::ResponseAction HandleRawData( const net::URLFetcher* source, const GURL& url, - const std::string& data) OVERRIDE; + const std::string& data) override; virtual CloudPrintURLFetcher::ResponseAction HandleJSONData( const net::URLFetcher* source, const GURL& url, base::DictionaryValue* json_data, - bool succeeded) OVERRIDE; + bool succeeded) override; void SetHandleRawResponse(bool handle_raw_response) { handle_raw_response_ = handle_raw_response; @@ -186,7 +186,7 @@ class CloudPrintURLFetcherOverloadTest : public CloudPrintURLFetcherTest { virtual CloudPrintURLFetcher::ResponseAction HandleRawData( const net::URLFetcher* source, const GURL& url, - const std::string& data) OVERRIDE; + const std::string& data) override; private: int response_count_; @@ -202,9 +202,9 @@ class CloudPrintURLFetcherRetryBackoffTest : public CloudPrintURLFetcherTest { virtual CloudPrintURLFetcher::ResponseAction HandleRawData( const net::URLFetcher* source, const GURL& url, - const std::string& data) OVERRIDE; + const std::string& data) override; - virtual void OnRequestGiveUp() OVERRIDE; + virtual void OnRequestGiveUp() override; private: int response_count_; diff --git a/chrome/service/cloud_print/cloud_print_wipeout.h b/chrome/service/cloud_print/cloud_print_wipeout.h index d20fe40..62d52d5 100644 --- a/chrome/service/cloud_print/cloud_print_wipeout.h +++ b/chrome/service/cloud_print/cloud_print_wipeout.h @@ -35,10 +35,10 @@ class CloudPrintWipeout : public CloudPrintURLFetcherDelegate { const net::URLFetcher* source, const GURL& url, base::DictionaryValue* json_data, - bool succeeded) OVERRIDE; - virtual void OnRequestGiveUp() OVERRIDE; - virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() OVERRIDE; - virtual std::string GetAuthHeader() OVERRIDE; + bool succeeded) override; + virtual void OnRequestGiveUp() override; + virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override; + virtual std::string GetAuthHeader() override; private: void UnregisterNextPrinter(); diff --git a/chrome/service/cloud_print/connector_settings_unittest.cc b/chrome/service/cloud_print/connector_settings_unittest.cc index 01ac875..648c8a5 100644 --- a/chrome/service/cloud_print/connector_settings_unittest.cc +++ b/chrome/service/cloud_print/connector_settings_unittest.cc @@ -48,7 +48,7 @@ const char kServiceStateContent[] = class ConnectorSettingsTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); message_loop_proxy_ = base::MessageLoopProxy::current(); } diff --git a/chrome/service/cloud_print/job_status_updater.h b/chrome/service/cloud_print/job_status_updater.h index 2fdc356..01863f9 100644 --- a/chrome/service/cloud_print/job_status_updater.h +++ b/chrome/service/cloud_print/job_status_updater.h @@ -49,9 +49,9 @@ class JobStatusUpdater : public base::RefCountedThreadSafe<JobStatusUpdater>, const net::URLFetcher* source, const GURL& url, base::DictionaryValue* json_data, - bool succeeded) OVERRIDE; - virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() OVERRIDE; - virtual std::string GetAuthHeader() OVERRIDE; + bool succeeded) override; + virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override; + virtual std::string GetAuthHeader() override; base::Time start_time() const { return start_time_; diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc index 4144517..19d6ddf 100644 --- a/chrome/service/cloud_print/print_system_cups.cc +++ b/chrome/service/cloud_print/print_system_cups.cc @@ -76,26 +76,26 @@ class PrintSystemCUPS : public PrintSystem { explicit PrintSystemCUPS(const base::DictionaryValue* print_system_settings); // PrintSystem implementation. - virtual PrintSystemResult Init() OVERRIDE; + virtual PrintSystemResult Init() override; virtual PrintSystem::PrintSystemResult EnumeratePrinters( - printing::PrinterList* printer_list) OVERRIDE; + printing::PrinterList* printer_list) override; virtual void GetPrinterCapsAndDefaults( const std::string& printer_name, - const PrinterCapsAndDefaultsCallback& callback) OVERRIDE; - virtual bool IsValidPrinter(const std::string& printer_name) OVERRIDE; + const PrinterCapsAndDefaultsCallback& callback) override; + virtual bool IsValidPrinter(const std::string& printer_name) override; virtual bool ValidatePrintTicket( const std::string& printer_name, const std::string& print_ticket_data, - const std::string& print_ticket_mime_type) OVERRIDE; + const std::string& print_ticket_mime_type) override; virtual bool GetJobDetails(const std::string& printer_name, PlatformJobId job_id, - PrintJobDetails *job_details) OVERRIDE; - virtual PrintSystem::PrintServerWatcher* CreatePrintServerWatcher() OVERRIDE; + PrintJobDetails *job_details) override; + virtual PrintSystem::PrintServerWatcher* CreatePrintServerWatcher() override; virtual PrintSystem::PrinterWatcher* CreatePrinterWatcher( - const std::string& printer_name) OVERRIDE; - virtual PrintSystem::JobSpooler* CreateJobSpooler() OVERRIDE; - virtual bool UseCddAndCjt() OVERRIDE; - virtual std::string GetSupportedMimeTypes() OVERRIDE; + const std::string& printer_name) override; + virtual PrintSystem::JobSpooler* CreateJobSpooler() override; + virtual bool UseCddAndCjt() override; + virtual std::string GetSupportedMimeTypes() override; // Helper functions. PlatformJobId SpoolPrintJob(const std::string& print_ticket, @@ -181,7 +181,7 @@ class PrintServerWatcherCUPS // PrintSystem::PrintServerWatcher implementation. virtual bool StartWatching( - PrintSystem::PrintServerWatcher::Delegate* delegate) OVERRIDE { + PrintSystem::PrintServerWatcher::Delegate* delegate) override { delegate_ = delegate; printers_hash_ = GetPrintersHash(); base::MessageLoop::current()->PostDelayedTask( @@ -191,7 +191,7 @@ class PrintServerWatcherCUPS return true; } - virtual bool StopWatching() OVERRIDE { + virtual bool StopWatching() override { delegate_ = NULL; return true; } @@ -254,7 +254,7 @@ class PrinterWatcherCUPS // PrintSystem::PrinterWatcher implementation. virtual bool StartWatching( - PrintSystem::PrinterWatcher::Delegate* delegate) OVERRIDE{ + PrintSystem::PrinterWatcher::Delegate* delegate) override{ scoped_refptr<printing::PrintBackend> print_backend( printing::PrintBackend::CreateInstance(NULL)); crash_keys::ScopedPrinterInfo crash_key( @@ -277,13 +277,13 @@ class PrinterWatcherCUPS return true; } - virtual bool StopWatching() OVERRIDE{ + virtual bool StopWatching() override{ delegate_ = NULL; return true; } virtual bool GetCurrentPrinterInfo( - printing::PrinterBasicInfo* printer_info) OVERRIDE { + printing::PrinterBasicInfo* printer_info) override { DCHECK(printer_info); return print_system_->GetPrinterInfo(printer_name_, printer_info); } @@ -380,7 +380,7 @@ class JobSpoolerCUPS : public PrintSystem::JobSpooler { const std::string& printer_name, const std::string& job_title, const std::vector<std::string>& tags, - JobSpooler::Delegate* delegate) OVERRIDE{ + JobSpooler::Delegate* delegate) override{ DCHECK(delegate); bool dry_run = false; int job_id = print_system_->SpoolPrintJob( diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc index 7908485..ca2045d7 100644 --- a/chrome/service/cloud_print/print_system_win.cc +++ b/chrome/service/cloud_print/print_system_win.cc @@ -140,24 +140,24 @@ class PrintServerWatcherWin // PrintSystem::PrintServerWatcher implementation. virtual bool StartWatching( - PrintSystem::PrintServerWatcher::Delegate* delegate) OVERRIDE{ + PrintSystem::PrintServerWatcher::Delegate* delegate) override{ delegate_ = delegate; return watcher_.Start(std::string(), this); } - virtual bool StopWatching() OVERRIDE{ + virtual bool StopWatching() override{ bool ret = watcher_.Stop(); delegate_ = NULL; return ret; } // PrintSystemWatcherWin::Delegate implementation. - virtual void OnPrinterAdded() OVERRIDE { + virtual void OnPrinterAdded() override { delegate_->OnPrinterAdded(); } - virtual void OnPrinterDeleted() OVERRIDE {} - virtual void OnPrinterChanged() OVERRIDE {} - virtual void OnJobChanged() OVERRIDE {} + virtual void OnPrinterDeleted() override {} + virtual void OnPrinterChanged() override {} + virtual void OnJobChanged() override {} protected: virtual ~PrintServerWatcherWin() {} @@ -180,33 +180,33 @@ class PrinterWatcherWin // PrintSystem::PrinterWatcher implementation. virtual bool StartWatching( - PrintSystem::PrinterWatcher::Delegate* delegate) OVERRIDE { + PrintSystem::PrinterWatcher::Delegate* delegate) override { delegate_ = delegate; return watcher_.Start(printer_name_, this); } - virtual bool StopWatching() OVERRIDE { + virtual bool StopWatching() override { bool ret = watcher_.Stop(); delegate_ = NULL; return ret; } virtual bool GetCurrentPrinterInfo( - printing::PrinterBasicInfo* printer_info) OVERRIDE { + printing::PrinterBasicInfo* printer_info) override { return watcher_.GetCurrentPrinterInfo(printer_info); } // PrintSystemWatcherWin::Delegate implementation. - virtual void OnPrinterAdded() OVERRIDE { + virtual void OnPrinterAdded() override { NOTREACHED(); } - virtual void OnPrinterDeleted() OVERRIDE { + virtual void OnPrinterDeleted() override { delegate_->OnPrinterDeleted(); } - virtual void OnPrinterChanged() OVERRIDE { + virtual void OnPrinterChanged() override { delegate_->OnPrinterChanged(); } - virtual void OnJobChanged() OVERRIDE { + virtual void OnJobChanged() override { delegate_->OnJobChanged(); } @@ -233,7 +233,7 @@ class JobSpoolerWin : public PrintSystem::JobSpooler { const std::string& printer_name, const std::string& job_title, const std::vector<std::string>& tags, - JobSpooler::Delegate* delegate) OVERRIDE { + JobSpooler::Delegate* delegate) override { // TODO(gene): add tags handling. scoped_refptr<printing::PrintBackend> print_backend( printing::PrintBackend::CreateInstance(NULL)); @@ -339,7 +339,7 @@ class JobSpoolerWin : public PrintSystem::JobSpooler { // ServiceUtilityProcessHost::Client implementation. virtual void OnRenderPDFPagesToMetafilePageDone( double scale_factor, - const printing::MetafilePlayer& emf) OVERRIDE { + const printing::MetafilePlayer& emf) override { PreparePageDCForPrinting(printer_dc_.Get(), scale_factor); ::StartPage(printer_dc_.Get()); emf.SafePlayback(printer_dc_.Get()); @@ -347,14 +347,14 @@ class JobSpoolerWin : public PrintSystem::JobSpooler { } // ServiceUtilityProcessHost::Client implementation. - virtual void OnRenderPDFPagesToMetafileDone(bool success) OVERRIDE { + virtual void OnRenderPDFPagesToMetafileDone(bool success) override { PrintJobDone(success); } - virtual void OnChildDied() OVERRIDE { PrintJobDone(false); } + virtual void OnChildDied() override { PrintJobDone(false); } // base::win::ObjectWatcher::Delegate implementation. - virtual void OnObjectSignaled(HANDLE object) OVERRIDE { + virtual void OnObjectSignaled(HANDLE object) override { // TODO(vadimt): Remove ScopedProfile below once crbug.com/418183 is fixed. tracked_objects::ScopedProfile tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( @@ -534,7 +534,7 @@ class PrinterCapsHandler : public ServiceUtilityProcessHost::Client { } // ServiceUtilityProcessHost::Client implementation. - virtual void OnChildDied() OVERRIDE { + virtual void OnChildDied() override { OnGetPrinterCapsAndDefaults(false, printer_name_, printing::PrinterCapsAndDefaults()); } @@ -542,7 +542,7 @@ class PrinterCapsHandler : public ServiceUtilityProcessHost::Client { virtual void OnGetPrinterCapsAndDefaults( bool succeeded, const std::string& printer_name, - const printing::PrinterCapsAndDefaults& caps_and_defaults) OVERRIDE { + const printing::PrinterCapsAndDefaults& caps_and_defaults) override { callback_.Run(succeeded, printer_name, caps_and_defaults); callback_.Reset(); Release(); @@ -551,7 +551,7 @@ class PrinterCapsHandler : public ServiceUtilityProcessHost::Client { virtual void OnGetPrinterSemanticCapsAndDefaults( bool succeeded, const std::string& printer_name, - const printing::PrinterSemanticCapsAndDefaults& semantic_info) OVERRIDE { + const printing::PrinterSemanticCapsAndDefaults& semantic_info) override { printing::PrinterCapsAndDefaults printer_info; if (succeeded) { printer_info.caps_mime_type = kContentTypeJSON; @@ -626,26 +626,26 @@ class PrintSystemWin : public PrintSystem { PrintSystemWin(); // PrintSystem implementation. - virtual PrintSystemResult Init() OVERRIDE; + virtual PrintSystemResult Init() override; virtual PrintSystem::PrintSystemResult EnumeratePrinters( - printing::PrinterList* printer_list) OVERRIDE; + printing::PrinterList* printer_list) override; virtual void GetPrinterCapsAndDefaults( const std::string& printer_name, - const PrinterCapsAndDefaultsCallback& callback) OVERRIDE; - virtual bool IsValidPrinter(const std::string& printer_name) OVERRIDE; + const PrinterCapsAndDefaultsCallback& callback) override; + virtual bool IsValidPrinter(const std::string& printer_name) override; virtual bool ValidatePrintTicket( const std::string& printer_name, const std::string& print_ticket_data, - const std::string& print_ticket_data_mime_type) OVERRIDE; + const std::string& print_ticket_data_mime_type) override; virtual bool GetJobDetails(const std::string& printer_name, PlatformJobId job_id, - PrintJobDetails *job_details) OVERRIDE; - virtual PrintSystem::PrintServerWatcher* CreatePrintServerWatcher() OVERRIDE; + PrintJobDetails *job_details) override; + virtual PrintSystem::PrintServerWatcher* CreatePrintServerWatcher() override; virtual PrintSystem::PrinterWatcher* CreatePrinterWatcher( - const std::string& printer_name) OVERRIDE; - virtual PrintSystem::JobSpooler* CreateJobSpooler() OVERRIDE; - virtual bool UseCddAndCjt() OVERRIDE; - virtual std::string GetSupportedMimeTypes() OVERRIDE; + const std::string& printer_name) override; + virtual PrintSystem::JobSpooler* CreateJobSpooler() override; + virtual bool UseCddAndCjt() override; + virtual std::string GetSupportedMimeTypes() override; private: std::string PrintSystemWin::GetPrinterDriverInfo( diff --git a/chrome/service/cloud_print/printer_job_handler.h b/chrome/service/cloud_print/printer_job_handler.h index 3c1eb11..46d29fd 100644 --- a/chrome/service/cloud_print/printer_job_handler.h +++ b/chrome/service/cloud_print/printer_job_handler.h @@ -121,33 +121,33 @@ class PrinterJobHandler : public base::RefCountedThreadSafe<PrinterJobHandler>, const net::URLRequestStatus& status, int response_code, const net::ResponseCookies& cookies, - const std::string& data) OVERRIDE; + const std::string& data) override; virtual CloudPrintURLFetcher::ResponseAction HandleRawData( const net::URLFetcher* source, const GURL& url, - const std::string& data) OVERRIDE; + const std::string& data) override; virtual CloudPrintURLFetcher::ResponseAction HandleJSONData( const net::URLFetcher* source, const GURL& url, base::DictionaryValue* json_data, - bool succeeded) OVERRIDE; - virtual void OnRequestGiveUp() OVERRIDE; - virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() OVERRIDE; - virtual std::string GetAuthHeader() OVERRIDE; + bool succeeded) override; + virtual void OnRequestGiveUp() override; + virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override; + virtual std::string GetAuthHeader() override; // JobStatusUpdater::Delegate implementation - virtual bool OnJobCompleted(JobStatusUpdater* updater) OVERRIDE; - virtual void OnAuthError() OVERRIDE; + virtual bool OnJobCompleted(JobStatusUpdater* updater) override; + virtual void OnAuthError() override; // PrinterWatcherDelegate implementation - virtual void OnPrinterDeleted() OVERRIDE; - virtual void OnPrinterChanged() OVERRIDE; - virtual void OnJobChanged() OVERRIDE; + virtual void OnPrinterDeleted() override; + virtual void OnPrinterChanged() override; + virtual void OnJobChanged() override; // JobSpoolerDelegate implementation. // Called on print_thread_. - virtual void OnJobSpoolSucceeded(const PlatformJobId& job_id) OVERRIDE; - virtual void OnJobSpoolFailed() OVERRIDE; + virtual void OnJobSpoolSucceeded(const PlatformJobId& job_id) override; + virtual void OnJobSpoolFailed() override; // End Delegate implementations diff --git a/chrome/service/cloud_print/printer_job_handler_unittest.cc b/chrome/service/cloud_print/printer_job_handler_unittest.cc index 38b67e7..c1f770d 100644 --- a/chrome/service/cloud_print/printer_job_handler_unittest.cc +++ b/chrome/service/cloud_print/printer_job_handler_unittest.cc @@ -251,7 +251,7 @@ class CloudPrintURLFetcherNoServiceProcess context_getter_(new net::TestURLRequestContextGetter( base::MessageLoopProxy::current())) {} protected: - virtual net::URLRequestContextGetter* GetRequestContextGetter() OVERRIDE { + virtual net::URLRequestContextGetter* GetRequestContextGetter() override { return context_getter_.get(); } @@ -264,7 +264,7 @@ class CloudPrintURLFetcherNoServiceProcess class CloudPrintURLFetcherNoServiceProcessFactory : public CloudPrintURLFetcherFactory { public: - virtual CloudPrintURLFetcher* CreateCloudPrintURLFetcher() OVERRIDE { + virtual CloudPrintURLFetcher* CreateCloudPrintURLFetcher() override { return new CloudPrintURLFetcherNoServiceProcess; } @@ -441,8 +441,8 @@ class MockPrintSystem : public PrintSystem { class PrinterJobHandlerTest : public ::testing::Test { public: PrinterJobHandlerTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; void IdleOut(); bool GetPrinterInfo(printing::PrinterBasicInfo* info); void SendCapsAndDefaults( diff --git a/chrome/service/cloud_print/printer_job_queue_handler.cc b/chrome/service/cloud_print/printer_job_queue_handler.cc index 19c584f..48060c1 100644 --- a/chrome/service/cloud_print/printer_job_queue_handler.cc +++ b/chrome/service/cloud_print/printer_job_queue_handler.cc @@ -14,7 +14,7 @@ namespace cloud_print { class TimeProviderImpl : public PrinterJobQueueHandler::TimeProvider { public: - virtual base::Time GetNow() OVERRIDE; + virtual base::Time GetNow() override; }; base::Time TimeProviderImpl::GetNow() { |