diff options
author | mohan.reddy <mohan.reddy@samsung.com> | 2014-10-06 02:17:07 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-06 09:17:43 +0000 |
commit | de3401d659d40f0078f904babcb6b7a01b9f102d (patch) | |
tree | 6a982e1abcc97961662802bbd34d16a542318471 /cloud_print | |
parent | 889350dda972573569f4013d9611b18652b5a980 (diff) | |
download | chromium_src-de3401d659d40f0078f904babcb6b7a01b9f102d.zip chromium_src-de3401d659d40f0078f904babcb6b7a01b9f102d.tar.gz chromium_src-de3401d659d40f0078f904babcb6b7a01b9f102d.tar.bz2 |
Replacing the OVERRIDE with override and FINAL with final in cloud_print
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/630753002
Cr-Commit-Position: refs/heads/master@{#298210}
Diffstat (limited to 'cloud_print')
-rw-r--r-- | cloud_print/gcp20/prototype/cloud_print_request.h | 2 | ||||
-rw-r--r-- | cloud_print/gcp20/prototype/cloud_print_requester.h | 14 | ||||
-rw-r--r-- | cloud_print/gcp20/prototype/cloud_print_url_request_context_getter.h | 4 | ||||
-rw-r--r-- | cloud_print/gcp20/prototype/cloud_print_xmpp_listener.h | 8 | ||||
-rw-r--r-- | cloud_print/gcp20/prototype/printer.h | 68 | ||||
-rw-r--r-- | cloud_print/gcp20/prototype/privet_http_server.h | 10 | ||||
-rw-r--r-- | cloud_print/service/service_state.cc | 4 | ||||
-rw-r--r-- | cloud_print/service/win/chrome_launcher.h | 2 | ||||
-rw-r--r-- | cloud_print/service/win/cloud_print_service_config.cc | 2 | ||||
-rw-r--r-- | cloud_print/service/win/service_listener.h | 4 | ||||
-rw-r--r-- | cloud_print/service/win/setup_listener.h | 4 |
11 files changed, 61 insertions, 61 deletions
diff --git a/cloud_print/gcp20/prototype/cloud_print_request.h b/cloud_print/gcp20/prototype/cloud_print_request.h index 5adfe35..681299f 100644 --- a/cloud_print/gcp20/prototype/cloud_print_request.h +++ b/cloud_print/gcp20/prototype/cloud_print_request.h @@ -63,7 +63,7 @@ class CloudPrintRequest : public net::URLFetcherDelegate, Delegate* delegate); // net::URLFetcherDelegate methods: - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; // Method for handling timeout. void OnRequestTimeout(); diff --git a/cloud_print/gcp20/prototype/cloud_print_requester.h b/cloud_print/gcp20/prototype/cloud_print_requester.h index ff8306b..91c24a0 100644 --- a/cloud_print/gcp20/prototype/cloud_print_requester.h +++ b/cloud_print/gcp20/prototype/cloud_print_requester.h @@ -134,20 +134,20 @@ class CloudPrintRequester : public base::SupportsWeakPtr<CloudPrintRequester>, typedef base::Callback<void(const std::string&)> ParserCallback; // CloudPrintRequester::Delegate methods: - virtual void OnFetchComplete(const std::string& response) OVERRIDE; + virtual void OnFetchComplete(const std::string& response) override; virtual void OnFetchError(const std::string& server_api, int server_code, - int server_http_code) OVERRIDE; - virtual void OnFetchTimeoutReached() OVERRIDE; + int server_http_code) override; + virtual void OnFetchTimeoutReached() override; // gaia::GaiaOAuthClient::Delegate methods: 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; // Creates GET request. scoped_ptr<CloudPrintRequest> CreateGet(const GURL& url, diff --git a/cloud_print/gcp20/prototype/cloud_print_url_request_context_getter.h b/cloud_print/gcp20/prototype/cloud_print_url_request_context_getter.h index efe6719..1fb52a6 100644 --- a/cloud_print/gcp20/prototype/cloud_print_url_request_context_getter.h +++ b/cloud_print/gcp20/prototype/cloud_print_url_request_context_getter.h @@ -18,10 +18,10 @@ class CloudPrintURLRequestContextGetter : public net::URLRequestContextGetter { scoped_refptr<base::SingleThreadTaskRunner> task_runner); // URLRequestContextGetter implementation. - virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE; + virtual net::URLRequestContext* GetURLRequestContext() override; virtual scoped_refptr<base::SingleThreadTaskRunner> - GetNetworkTaskRunner() const OVERRIDE; + GetNetworkTaskRunner() const override; private: virtual ~CloudPrintURLRequestContextGetter(); diff --git a/cloud_print/gcp20/prototype/cloud_print_xmpp_listener.h b/cloud_print/gcp20/prototype/cloud_print_xmpp_listener.h index b2cf2b8..32dde8c 100644 --- a/cloud_print/gcp20/prototype/cloud_print_xmpp_listener.h +++ b/cloud_print/gcp20/prototype/cloud_print_xmpp_listener.h @@ -75,12 +75,12 @@ class CloudPrintXmppListener private: // notifier::PushClientObserver methods: - 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; // Stops listening and sending pings. void Disconnect(); diff --git a/cloud_print/gcp20/prototype/printer.h b/cloud_print/gcp20/prototype/printer.h index ab999b3..1c83939 100644 --- a/cloud_print/gcp20/prototype/printer.h +++ b/cloud_print/gcp20/prototype/printer.h @@ -55,77 +55,77 @@ class Printer : public base::SupportsWeakPtr<Printer>, // PrivetHttpServer::Delegate methods: virtual PrivetHttpServer::RegistrationErrorStatus RegistrationStart( - const std::string& user) OVERRIDE; + const std::string& user) override; virtual PrivetHttpServer::RegistrationErrorStatus RegistrationGetClaimToken( const std::string& user, std::string* token, - std::string* claim_url) OVERRIDE; + std::string* claim_url) override; virtual PrivetHttpServer::RegistrationErrorStatus RegistrationComplete( const std::string& user, - std::string* device_id) OVERRIDE; + std::string* device_id) override; virtual PrivetHttpServer::RegistrationErrorStatus RegistrationCancel( - const std::string& user) OVERRIDE; - virtual void GetRegistrationServerError(std::string* description) OVERRIDE; - virtual void CreateInfo(PrivetHttpServer::DeviceInfo* info) OVERRIDE; - virtual bool IsRegistered() const OVERRIDE; - virtual bool IsLocalPrintingAllowed() const OVERRIDE; - virtual bool CheckXPrivetTokenHeader(const std::string& token) const OVERRIDE; - virtual const base::DictionaryValue& GetCapabilities() OVERRIDE; + const std::string& user) override; + virtual void GetRegistrationServerError(std::string* description) override; + virtual void CreateInfo(PrivetHttpServer::DeviceInfo* info) override; + virtual bool IsRegistered() const override; + virtual bool IsLocalPrintingAllowed() const override; + virtual bool CheckXPrivetTokenHeader(const std::string& token) const override; + virtual const base::DictionaryValue& GetCapabilities() override; virtual LocalPrintJob::CreateResult CreateJob( const std::string& ticket, std::string* job_id, int* expires_in, int* error_timeout, - std::string* error_description) OVERRIDE; + std::string* error_description) override; virtual LocalPrintJob::SaveResult SubmitDoc( const LocalPrintJob& job, std::string* job_id, int* expires_in, std::string* error_description, - int* timeout) OVERRIDE; + int* timeout) override; virtual LocalPrintJob::SaveResult SubmitDocWithId( const LocalPrintJob& job, const std::string& job_id, int* expires_in, std::string* error_description, - int* timeout) OVERRIDE; + int* timeout) override; virtual bool GetJobState(const std::string& id, - LocalPrintJob::Info* info) OVERRIDE; + LocalPrintJob::Info* info) override; // CloudRequester::Delegate methods: virtual void OnRegistrationStartResponseParsed( const std::string& registration_token, const std::string& complete_invite_url, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual void OnRegistrationFinished( const std::string& refresh_token, const std::string& access_token, - int access_token_expires_in_seconds) OVERRIDE; - virtual void OnXmppJidReceived(const std::string& xmpp_jid) OVERRIDE; + int access_token_expires_in_seconds) override; + virtual void OnXmppJidReceived(const std::string& xmpp_jid) override; virtual void OnAccesstokenReceviced(const std::string& access_token, - int expires_in_seconds) OVERRIDE; - virtual void OnRegistrationError(const std::string& description) OVERRIDE; - virtual void OnNetworkError() OVERRIDE; - virtual void OnServerError(const std::string& description) OVERRIDE; - virtual void OnAuthError() OVERRIDE; - virtual std::string GetAccessToken() OVERRIDE; + int expires_in_seconds) override; + virtual void OnRegistrationError(const std::string& description) override; + virtual void OnNetworkError() override; + virtual void OnServerError(const std::string& description) override; + virtual void OnAuthError() override; + virtual std::string GetAccessToken() override; virtual void OnPrintJobsAvailable( - const std::vector<cloud_print_response_parser::Job>& jobs) OVERRIDE; + const std::vector<cloud_print_response_parser::Job>& jobs) override; virtual void OnPrintJobDownloaded( - const cloud_print_response_parser::Job& job) OVERRIDE; - virtual void OnPrintJobDone() OVERRIDE; + const cloud_print_response_parser::Job& job) override; + virtual void OnPrintJobDone() override; virtual void OnLocalSettingsReceived( LocalSettings::State state, - const LocalSettings& settings) OVERRIDE; - virtual void OnLocalSettingsUpdated() OVERRIDE; + const LocalSettings& settings) override; + virtual void OnLocalSettingsUpdated() override; // CloudPrintXmppListener::Delegate methods: - virtual void OnXmppConnected() OVERRIDE; - virtual void OnXmppAuthError() OVERRIDE; - virtual void OnXmppNetworkError() OVERRIDE; - virtual void OnXmppNewPrintJob(const std::string& device_id) OVERRIDE; - virtual void OnXmppNewLocalSettings(const std::string& device_id) OVERRIDE; - virtual void OnXmppDeleteNotification(const std::string& device_id) OVERRIDE; + virtual void OnXmppConnected() override; + virtual void OnXmppAuthError() override; + virtual void OnXmppNetworkError() override; + virtual void OnXmppNewPrintJob(const std::string& device_id) override; + virtual void OnXmppNewLocalSettings(const std::string& device_id) override; + virtual void OnXmppDeleteNotification(const std::string& device_id) override; // Method for trying to reconnecting to server on start or after network fail. void TryConnect(); diff --git a/cloud_print/gcp20/prototype/privet_http_server.h b/cloud_print/gcp20/prototype/privet_http_server.h index 5a3a2fe..26fcdfb 100644 --- a/cloud_print/gcp20/prototype/privet_http_server.h +++ b/cloud_print/gcp20/prototype/privet_http_server.h @@ -141,16 +141,16 @@ class PrivetHttpServer: public net::HttpServer::Delegate { private: // net::HttpServer::Delegate methods: - virtual void OnConnect(int connection_id) OVERRIDE {} + virtual void OnConnect(int connection_id) override {} virtual void OnHttpRequest( int connection_id, - const net::HttpServerRequestInfo& info) OVERRIDE; + const net::HttpServerRequestInfo& info) override; virtual void OnWebSocketRequest( int connection_id, - const net::HttpServerRequestInfo& info) OVERRIDE; + const net::HttpServerRequestInfo& info) override; virtual void OnWebSocketMessage(int connection_id, - const std::string& data) OVERRIDE; - virtual void OnClose(int connection_id) OVERRIDE; + const std::string& data) override; + virtual void OnClose(int connection_id) override; // Sends error as response. Invoked when request method is invalid. void ReportInvalidMethod(int connection_id); diff --git a/cloud_print/service/service_state.cc b/cloud_print/service/service_state.cc index 811c2c1..30e191b 100644 --- a/cloud_print/service/service_state.cc +++ b/cloud_print/service/service_state.cc @@ -38,7 +38,7 @@ const int64 kRequestTimeoutMs = 10 * 1000; class ServiceStateURLRequestDelegate : public net::URLRequest::Delegate { public: - virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE { + virtual void OnResponseStarted(net::URLRequest* request) override { if (request->GetResponseCode() == 200) { Read(request); if (request->status().is_io_pending()) @@ -48,7 +48,7 @@ class ServiceStateURLRequestDelegate : public net::URLRequest::Delegate { } virtual void OnReadCompleted(net::URLRequest* request, - int bytes_read) OVERRIDE { + int bytes_read) override { Read(request); if (!request->status().is_io_pending()) base::MessageLoop::current()->Quit(); diff --git a/cloud_print/service/win/chrome_launcher.h b/cloud_print/service/win/chrome_launcher.h index 723bb77..073add7 100644 --- a/cloud_print/service/win/chrome_launcher.h +++ b/cloud_print/service/win/chrome_launcher.h @@ -22,7 +22,7 @@ class ChromeLauncher : public base::DelegateSimpleThread::Delegate { bool Start(); void Stop(); - virtual void Run() OVERRIDE; + virtual void Run() override; static std::string CreateServiceStateFile( const std::string& proxy_id, diff --git a/cloud_print/service/win/cloud_print_service_config.cc b/cloud_print/service/win/cloud_print_service_config.cc index c3c9bc8..a1e13dba 100644 --- a/cloud_print/service/win/cloud_print_service_config.cc +++ b/cloud_print/service/win/cloud_print_service_config.cc @@ -37,7 +37,7 @@ class SetupDialog : public base::RefCounted<SetupDialog>, virtual ~Dispatcher() {}; // MessagePumpDispatcher: - virtual uint32_t Dispatch(const MSG& msg) OVERRIDE { + virtual uint32_t Dispatch(const MSG& msg) override { MSG msg2 = msg; uint32_t action = POST_DISPATCH_NONE; if (!dialog_->IsDialogMessage(&msg2)) diff --git a/cloud_print/service/win/service_listener.h b/cloud_print/service/win/service_listener.h index cdbc451..c100167 100644 --- a/cloud_print/service/win/service_listener.h +++ b/cloud_print/service/win/service_listener.h @@ -25,8 +25,8 @@ class ServiceListener : public IPC::Listener { explicit ServiceListener(const base::FilePath& user_data_dir); virtual ~ServiceListener(); - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; + virtual void OnChannelConnected(int32 peer_pid) override; private: void Disconnect(); diff --git a/cloud_print/service/win/setup_listener.h b/cloud_print/service/win/setup_listener.h index 80223c7..a43aea1 100644 --- a/cloud_print/service/win/setup_listener.h +++ b/cloud_print/service/win/setup_listener.h @@ -38,8 +38,8 @@ class SetupListener : public IPC::Listener { explicit SetupListener(const base::string16& user); virtual ~SetupListener(); - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; - virtual void OnChannelError() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; + virtual void OnChannelError() override; bool WaitResponce(const base::TimeDelta& delta); |