Skip to content

Commit

Permalink
Replacing the OVERRIDE with override and FINAL with final in chrome/s…
Browse files Browse the repository at this point in the history
…ervice

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}
  • Loading branch information
mohan-486 authored and Commit bot committed Oct 7, 2014
1 parent 0e45454 commit 0da06d0
Show file tree
Hide file tree
Showing 21 changed files with 130 additions and 130 deletions.
14 changes: 7 additions & 7 deletions chrome/service/cloud_print/cloud_print_auth.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
14 changes: 7 additions & 7 deletions chrome/service/cloud_print/cloud_print_connector.h
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
12 changes: 6 additions & 6 deletions chrome/service/cloud_print/cloud_print_proxy.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
16 changes: 8 additions & 8 deletions chrome/service/cloud_print/cloud_print_proxy_backend.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion chrome/service/cloud_print/cloud_print_url_fetcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
22 changes: 11 additions & 11 deletions chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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_);
Expand All @@ -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());
}
Expand Down Expand Up @@ -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();
}

Expand Down Expand Up @@ -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;
Expand All @@ -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_;
Expand All @@ -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_;
Expand Down
8 changes: 4 additions & 4 deletions chrome/service/cloud_print/cloud_print_wipeout.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion chrome/service/cloud_print/connector_settings_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
6 changes: 3 additions & 3 deletions chrome/service/cloud_print/job_status_updater.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
34 changes: 17 additions & 17 deletions chrome/service/cloud_print/print_system_cups.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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(
Expand All @@ -191,7 +191,7 @@ class PrintServerWatcherCUPS
return true;
}

virtual bool StopWatching() OVERRIDE {
virtual bool StopWatching() override {
delegate_ = NULL;
return true;
}
Expand Down Expand Up @@ -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(
Expand All @@ -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);
}
Expand Down Expand Up @@ -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(
Expand Down
Loading

0 comments on commit 0da06d0

Please sign in to comment.