Commit 80b796a8 authored by nick's avatar nick Committed by Commit bot

Update {virtual,override} to follow C++11 style in cloud_print.

The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override.

This patch was manually generated using a regex and a text editor.

BUG=417463

Review URL: https://codereview.chromium.org/1100633004

Cr-Commit-Position: refs/heads/master@{#327154}
parent 731d868b
......@@ -38,7 +38,7 @@ class CloudPrintRequest : public net::URLFetcherDelegate,
virtual void OnFetchTimeoutReached() = 0;
};
virtual ~CloudPrintRequest();
~CloudPrintRequest() override;
// Creates GET request.
static scoped_ptr<CloudPrintRequest> CreateGet(const GURL& url,
......@@ -63,7 +63,7 @@ class CloudPrintRequest : public net::URLFetcherDelegate,
Delegate* delegate);
// net::URLFetcherDelegate methods:
virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
void OnURLFetchComplete(const net::URLFetcher* source) override;
// Method for handling timeout.
void OnRequestTimeout();
......
......@@ -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 OnFetchError(const std::string& server_api,
int server_code,
int server_http_code) override;
virtual void OnFetchTimeoutReached() override;
void OnFetchComplete(const std::string& response) override;
void OnFetchError(const std::string& server_api,
int server_code,
int server_http_code) override;
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;
virtual void OnRefreshTokenResponse(const std::string& access_token,
int expires_in_seconds) override;
virtual void OnOAuthError() override;
virtual void OnNetworkError(int response_code) override;
void OnGetTokensResponse(const std::string& refresh_token,
const std::string& access_token,
int expires_in_seconds) override;
void OnRefreshTokenResponse(const std::string& access_token,
int expires_in_seconds) override;
void OnOAuthError() override;
void OnNetworkError(int response_code) override;
// Creates GET request.
scoped_ptr<CloudPrintRequest> CreateGet(const GURL& url,
......
......@@ -18,13 +18,13 @@ class CloudPrintURLRequestContextGetter : public net::URLRequestContextGetter {
scoped_refptr<base::SingleThreadTaskRunner> task_runner);
// URLRequestContextGetter implementation.
virtual net::URLRequestContext* GetURLRequestContext() override;
net::URLRequestContext* GetURLRequestContext() override;
virtual scoped_refptr<base::SingleThreadTaskRunner>
scoped_refptr<base::SingleThreadTaskRunner>
GetNetworkTaskRunner() const override;
private:
virtual ~CloudPrintURLRequestContextGetter();
~CloudPrintURLRequestContextGetter() override;
scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
scoped_ptr<net::URLRequestContext> context_;
......
......@@ -65,7 +65,7 @@ class CloudPrintXmppListener
scoped_refptr<base::SingleThreadTaskRunner> task_runner,
Delegate* delegate);
virtual ~CloudPrintXmppListener();
~CloudPrintXmppListener() override;
// Connects to the server.
void Connect(const std::string& access_token);
......@@ -75,12 +75,12 @@ class CloudPrintXmppListener
private:
// notifier::PushClientObserver methods:
virtual void OnNotificationsEnabled() override;
virtual void OnNotificationsDisabled(
void OnNotificationsEnabled() override;
void OnNotificationsDisabled(
notifier::NotificationsDisabledReason reason) override;
virtual void OnIncomingNotification(
void OnIncomingNotification(
const notifier::Notification& notification) override;
virtual void OnPingResponse() override;
void OnPingResponse() override;
// Stops listening and sending pings.
void Disconnect();
......
......@@ -30,7 +30,7 @@ class Printer : public base::SupportsWeakPtr<Printer>,
Printer();
// Destroys the object.
virtual ~Printer();
~Printer() override;
// Starts all servers.
bool Start();
......@@ -54,78 +54,77 @@ class Printer : public base::SupportsWeakPtr<Printer>,
std::string GetRawCdd();
// PrivetHttpServer::Delegate methods:
virtual PrivetHttpServer::RegistrationErrorStatus RegistrationStart(
PrivetHttpServer::RegistrationErrorStatus RegistrationStart(
const std::string& user) override;
virtual PrivetHttpServer::RegistrationErrorStatus RegistrationGetClaimToken(
PrivetHttpServer::RegistrationErrorStatus RegistrationGetClaimToken(
const std::string& user,
std::string* token,
std::string* claim_url) override;
virtual PrivetHttpServer::RegistrationErrorStatus RegistrationComplete(
PrivetHttpServer::RegistrationErrorStatus RegistrationComplete(
const std::string& user,
std::string* device_id) override;
virtual PrivetHttpServer::RegistrationErrorStatus RegistrationCancel(
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;
virtual LocalPrintJob::CreateResult CreateJob(
void GetRegistrationServerError(std::string* description) override;
void CreateInfo(PrivetHttpServer::DeviceInfo* info) override;
bool IsRegistered() const override;
bool IsLocalPrintingAllowed() const override;
bool CheckXPrivetTokenHeader(const std::string& token) const override;
const base::DictionaryValue& GetCapabilities() override;
LocalPrintJob::CreateResult CreateJob(
const std::string& ticket,
std::string* job_id,
int* expires_in,
int* error_timeout,
std::string* error_description) override;
virtual LocalPrintJob::SaveResult SubmitDoc(
LocalPrintJob::SaveResult SubmitDoc(
const LocalPrintJob& job,
std::string* job_id,
int* expires_in,
std::string* error_description,
int* timeout) override;
virtual LocalPrintJob::SaveResult SubmitDocWithId(
LocalPrintJob::SaveResult SubmitDocWithId(
const LocalPrintJob& job,
const std::string& job_id,
int* expires_in,
std::string* error_description,
int* timeout) override;
virtual bool GetJobState(const std::string& id,
LocalPrintJob::Info* info) override;
bool GetJobState(const std::string& id, LocalPrintJob::Info* info) override;
// CloudRequester::Delegate methods:
virtual void OnRegistrationStartResponseParsed(
void OnRegistrationStartResponseParsed(
const std::string& registration_token,
const std::string& complete_invite_url,
const std::string& device_id) override;
virtual void OnRegistrationFinished(
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;
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;
virtual void OnPrintJobsAvailable(
void OnXmppJidReceived(const std::string& xmpp_jid) override;
void OnAccesstokenReceviced(const std::string& access_token,
int expires_in_seconds) override;
void OnRegistrationError(const std::string& description) override;
void OnNetworkError() override;
void OnServerError(const std::string& description) override;
void OnAuthError() override;
std::string GetAccessToken() override;
void OnPrintJobsAvailable(
const std::vector<cloud_print_response_parser::Job>& jobs) override;
virtual void OnPrintJobDownloaded(
void OnPrintJobDownloaded(
const cloud_print_response_parser::Job& job) override;
virtual void OnPrintJobDone() override;
virtual void OnLocalSettingsReceived(
void OnPrintJobDone() override;
void OnLocalSettingsReceived(
LocalSettings::State state,
const LocalSettings& settings) override;
virtual void OnLocalSettingsUpdated() override;
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;
void OnXmppConnected() override;
void OnXmppAuthError() override;
void OnXmppNetworkError() override;
void OnXmppNewPrintJob(const std::string& device_id) override;
void OnXmppNewLocalSettings(const std::string& device_id) override;
void OnXmppDeleteNotification(const std::string& device_id) override;
// Method for trying to reconnecting to server on start or after network fail.
void TryConnect();
......
......@@ -141,16 +141,15 @@ class PrivetHttpServer: public net::HttpServer::Delegate {
private:
// net::HttpServer::Delegate methods:
virtual void OnConnect(int connection_id) override {}
virtual void OnHttpRequest(
void OnConnect(int connection_id) override {}
void OnHttpRequest(
int connection_id,
const net::HttpServerRequestInfo& info) override;
virtual void OnWebSocketRequest(
void OnWebSocketRequest(
int connection_id,
const net::HttpServerRequestInfo& info) override;
virtual void OnWebSocketMessage(int connection_id,
const std::string& data) override;
virtual void OnClose(int connection_id) override;
void OnWebSocketMessage(int connection_id, const std::string& data) override;
void OnClose(int connection_id) override;
// Sends error as response. Invoked when request method is invalid.
void ReportInvalidMethod(int connection_id);
......
......@@ -17,12 +17,13 @@ class ChromeLauncher : public base::DelegateSimpleThread::Delegate {
public:
explicit ChromeLauncher(const base::FilePath& user_data);
virtual ~ChromeLauncher();
~ChromeLauncher() override;
bool Start();
void Stop();
virtual void Run() override;
// base::DelegateSimpleThread::Delegate:
void Run() override;
static std::string CreateServiceStateFile(
const std::string& proxy_id,
......
......@@ -34,10 +34,10 @@ class SetupDialog : public base::RefCounted<SetupDialog>,
class Dispatcher : public base::MessagePumpDispatcher {
public:
explicit Dispatcher(SetupDialog* dialog) : dialog_(dialog) {}
virtual ~Dispatcher() {};
~Dispatcher() override {}
// MessagePumpDispatcher:
virtual uint32_t Dispatch(const MSG& msg) override {
uint32_t Dispatch(const MSG& msg) override {
MSG msg2 = msg;
uint32_t action = POST_DISPATCH_NONE;
if (!dialog_->IsDialogMessage(&msg2))
......
......@@ -23,10 +23,10 @@ class Channel;
class ServiceListener : public IPC::Listener {
public:
explicit ServiceListener(const base::FilePath& user_data_dir);
virtual ~ServiceListener();
~ServiceListener() override;
virtual bool OnMessageReceived(const IPC::Message& msg) override;
virtual void OnChannelConnected(int32 peer_pid) override;
bool OnMessageReceived(const IPC::Message& msg) override;
void OnChannelConnected(int32 peer_pid) override;
private:
void Disconnect();
......
......@@ -36,10 +36,10 @@ class SetupListener : public IPC::Listener {
static const wchar_t kSetupPipeName[];
explicit SetupListener(const base::string16& user);
virtual ~SetupListener();
~SetupListener() override;
virtual bool OnMessageReceived(const IPC::Message& msg) override;
virtual void OnChannelError() override;
bool OnMessageReceived(const IPC::Message& msg) override;
void OnChannelError() override;
bool WaitResponce(const base::TimeDelta& delta);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment