summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-21 04:39:05 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-21 11:39:23 +0000
commitc072fff949cad2790f4cb731097c276897b37d0b (patch)
tree16153dd25f3aaf7b06ceaffc7d0e4682b2f94c57
parent0d20d8969982c6db6fef2680e3969b29e5b7036c (diff)
downloadchromium_src-c072fff949cad2790f4cb731097c276897b37d0b.zip
chromium_src-c072fff949cad2790f4cb731097c276897b37d0b.tar.gz
chromium_src-c072fff949cad2790f4cb731097c276897b37d0b.tar.bz2
Standardize usage of virtual/override/final in chrome/browser/supervised_user/
This patch was automatically generated by applying clang fixit hints generated by the plugin to the source tree. BUG=417463 TBR=bauerb@chromium.org Review URL: https://codereview.chromium.org/652473004 Cr-Commit-Position: refs/heads/master@{#300460}
-rw-r--r--chrome/browser/supervised_user/custodian_profile_downloader_service.h16
-rw-r--r--chrome/browser/supervised_user/custodian_profile_downloader_service_factory.h4
-rw-r--r--chrome/browser/supervised_user/experimental/supervised_user_blacklist_downloader.h4
-rw-r--r--chrome/browser/supervised_user/permission_request_creator_apiary.h21
-rw-r--r--chrome/browser/supervised_user/permission_request_creator_apiary_unittest.cc12
-rw-r--r--chrome/browser/supervised_user/permission_request_creator_sync.h9
-rw-r--r--chrome/browser/supervised_user/supervised_user_browsertest.cc4
-rw-r--r--chrome/browser/supervised_user/supervised_user_interstitial.cc2
-rw-r--r--chrome/browser/supervised_user/supervised_user_interstitial.h12
-rw-r--r--chrome/browser/supervised_user/supervised_user_navigation_observer.cc14
-rw-r--r--chrome/browser/supervised_user/supervised_user_navigation_observer.h4
-rw-r--r--chrome/browser/supervised_user/supervised_user_pref_mapping_service.h4
-rw-r--r--chrome/browser/supervised_user/supervised_user_pref_mapping_service_factory.h4
-rw-r--r--chrome/browser/supervised_user/supervised_user_pref_store.h14
-rw-r--r--chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc6
-rw-r--r--chrome/browser/supervised_user/supervised_user_refresh_token_fetcher.cc34
-rw-r--r--chrome/browser/supervised_user/supervised_user_registration_utility.cc14
-rw-r--r--chrome/browser/supervised_user/supervised_user_registration_utility_stub.h8
-rw-r--r--chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc18
-rw-r--r--chrome/browser/supervised_user/supervised_user_resource_throttle.h8
-rw-r--r--chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc4
-rw-r--r--chrome/browser/supervised_user/supervised_user_service.h27
-rw-r--r--chrome/browser/supervised_user/supervised_user_service_browsertest.cc2
-rw-r--r--chrome/browser/supervised_user/supervised_user_service_factory.h6
-rw-r--r--chrome/browser/supervised_user/supervised_user_service_unittest.cc15
-rw-r--r--chrome/browser/supervised_user/supervised_user_settings_service.h17
-rw-r--r--chrome/browser/supervised_user/supervised_user_settings_service_factory.h6
-rw-r--r--chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc4
-rw-r--r--chrome/browser/supervised_user/supervised_user_shared_settings_service.h13
-rw-r--r--chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h4
-rw-r--r--chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc4
-rw-r--r--chrome/browser/supervised_user/supervised_user_sync_data_type_controller.h4
-rw-r--r--chrome/browser/supervised_user/supervised_user_sync_service.h13
-rw-r--r--chrome/browser/supervised_user/supervised_user_sync_service_factory.h4
-rw-r--r--chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc10
-rw-r--r--chrome/browser/supervised_user/supervised_user_theme.h8
-rw-r--r--chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc4
37 files changed, 167 insertions, 190 deletions
diff --git a/chrome/browser/supervised_user/custodian_profile_downloader_service.h b/chrome/browser/supervised_user/custodian_profile_downloader_service.h
index bd6c186..2792769 100644
--- a/chrome/browser/supervised_user/custodian_profile_downloader_service.h
+++ b/chrome/browser/supervised_user/custodian_profile_downloader_service.h
@@ -18,10 +18,10 @@ class CustodianProfileDownloaderService : public KeyedService,
typedef base::Callback<void(const base::string16& /* full name */)>
DownloadProfileCallback;
- virtual ~CustodianProfileDownloaderService();
+ ~CustodianProfileDownloaderService() override;
// KeyedService:
- virtual void Shutdown() override;
+ void Shutdown() override;
// Downloads the GAIA account information for the |custodian_profile_|.
// This is a best-effort attempt with no error reporting nor timeout.
@@ -31,12 +31,12 @@ class CustodianProfileDownloaderService : public KeyedService,
void DownloadProfile(const DownloadProfileCallback& callback);
// ProfileDownloaderDelegate:
- virtual bool NeedsProfilePicture() const override;
- virtual int GetDesiredImageSideLength() const override;
- virtual std::string GetCachedPictureURL() const override;
- virtual Profile* GetBrowserProfile() override;
- virtual void OnProfileDownloadSuccess(ProfileDownloader* downloader) override;
- virtual void OnProfileDownloadFailure(
+ bool NeedsProfilePicture() const override;
+ int GetDesiredImageSideLength() const override;
+ std::string GetCachedPictureURL() const override;
+ Profile* GetBrowserProfile() override;
+ void OnProfileDownloadSuccess(ProfileDownloader* downloader) override;
+ void OnProfileDownloadFailure(
ProfileDownloader* downloader,
ProfileDownloaderDelegate::FailureReason reason) override;
diff --git a/chrome/browser/supervised_user/custodian_profile_downloader_service_factory.h b/chrome/browser/supervised_user/custodian_profile_downloader_service_factory.h
index 67bbeb1..a9a79e5 100644
--- a/chrome/browser/supervised_user/custodian_profile_downloader_service_factory.h
+++ b/chrome/browser/supervised_user/custodian_profile_downloader_service_factory.h
@@ -23,10 +23,10 @@ class CustodianProfileDownloaderServiceFactory
DefaultSingletonTraits<CustodianProfileDownloaderServiceFactory>;
CustodianProfileDownloaderServiceFactory();
- virtual ~CustodianProfileDownloaderServiceFactory();
+ ~CustodianProfileDownloaderServiceFactory() override;
// BrowserContextKeyedServiceFactory:
- virtual KeyedService* BuildServiceInstanceFor(
+ KeyedService* BuildServiceInstanceFor(
content::BrowserContext* profile) const override;
};
diff --git a/chrome/browser/supervised_user/experimental/supervised_user_blacklist_downloader.h b/chrome/browser/supervised_user/experimental/supervised_user_blacklist_downloader.h
index 5795b8c..871d4e0 100644
--- a/chrome/browser/supervised_user/experimental/supervised_user_blacklist_downloader.h
+++ b/chrome/browser/supervised_user/experimental/supervised_user_blacklist_downloader.h
@@ -35,11 +35,11 @@ class SupervisedUserBlacklistDownloader : public net::URLFetcherDelegate {
const base::FilePath& path,
net::URLRequestContextGetter* request_context,
const DownloadFinishedCallback& callback);
- virtual ~SupervisedUserBlacklistDownloader();
+ ~SupervisedUserBlacklistDownloader() override;
private:
// net::URLFetcherDelegate implementation.
- virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+ void OnURLFetchComplete(const net::URLFetcher* source) override;
void OnFileExistsCheckDone(bool exists);
diff --git a/chrome/browser/supervised_user/permission_request_creator_apiary.h b/chrome/browser/supervised_user/permission_request_creator_apiary.h
index 9d1828b..c742c81 100644
--- a/chrome/browser/supervised_user/permission_request_creator_apiary.h
+++ b/chrome/browser/supervised_user/permission_request_creator_apiary.h
@@ -35,16 +35,15 @@ class PermissionRequestCreatorApiary : public PermissionRequestCreator,
scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper,
net::URLRequestContextGetter* context,
const GURL& apiary_url);
- virtual ~PermissionRequestCreatorApiary();
+ ~PermissionRequestCreatorApiary() override;
static scoped_ptr<PermissionRequestCreator> CreateWithProfile(
Profile* profile, const GURL& apiary_url);
// PermissionRequestCreator implementation:
- virtual bool IsEnabled() const override;
- virtual void CreatePermissionRequest(
- const GURL& url_requested,
- const SuccessCallback& callback) override;
+ bool IsEnabled() const override;
+ void CreatePermissionRequest(const GURL& url_requested,
+ const SuccessCallback& callback) override;
void set_url_fetcher_id_for_testing(int id) { url_fetcher_id_ = id; }
@@ -53,14 +52,14 @@ class PermissionRequestCreatorApiary : public PermissionRequestCreator,
typedef ScopedVector<Request>::iterator RequestIterator;
// OAuth2TokenService::Consumer implementation:
- virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
- const std::string& access_token,
- const base::Time& expiration_time) override;
- virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
- const GoogleServiceAuthError& error) override;
+ void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+ const std::string& access_token,
+ const base::Time& expiration_time) override;
+ void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+ const GoogleServiceAuthError& error) override;
// net::URLFetcherDelegate implementation.
- virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+ void OnURLFetchComplete(const net::URLFetcher* source) override;
std::string GetApiScopeToUse() const;
diff --git a/chrome/browser/supervised_user/permission_request_creator_apiary_unittest.cc b/chrome/browser/supervised_user/permission_request_creator_apiary_unittest.cc
index 7469933..261fc9f 100644
--- a/chrome/browser/supervised_user/permission_request_creator_apiary_unittest.cc
+++ b/chrome/browser/supervised_user/permission_request_creator_apiary_unittest.cc
@@ -36,15 +36,9 @@ class FakeSupervisedUserSigninManagerWrapper
FakeSupervisedUserSigninManagerWrapper()
: SupervisedUserSigninManagerWrapper(NULL, NULL) {}
- virtual std::string GetEffectiveUsername() const override {
- return kAccountId;
- }
- virtual std::string GetAccountIdToUse() const override {
- return kAccountId;
- }
- virtual std::string GetSyncScopeToUse() const override {
- return kApiScope;
- }
+ std::string GetEffectiveUsername() const override { return kAccountId; }
+ std::string GetAccountIdToUse() const override { return kAccountId; }
+ std::string GetSyncScopeToUse() const override { return kApiScope; }
};
} // namespace
diff --git a/chrome/browser/supervised_user/permission_request_creator_sync.h b/chrome/browser/supervised_user/permission_request_creator_sync.h
index f269bc6..db71783 100644
--- a/chrome/browser/supervised_user/permission_request_creator_sync.h
+++ b/chrome/browser/supervised_user/permission_request_creator_sync.h
@@ -22,13 +22,12 @@ class PermissionRequestCreatorSync : public PermissionRequestCreator {
ProfileSyncService* sync_service,
const std::string& name,
const std::string& supervised_user_id);
- virtual ~PermissionRequestCreatorSync();
+ ~PermissionRequestCreatorSync() override;
// PermissionRequestCreator implementation:
- virtual bool IsEnabled() const override;
- virtual void CreatePermissionRequest(
- const GURL& url_requested,
- const SuccessCallback& callback) override;
+ bool IsEnabled() const override;
+ void CreatePermissionRequest(const GURL& url_requested,
+ const SuccessCallback& callback) override;
private:
SupervisedUserSettingsService* settings_service_;
diff --git a/chrome/browser/supervised_user/supervised_user_browsertest.cc b/chrome/browser/supervised_user/supervised_user_browsertest.cc
index 3fd9754..b41132d 100644
--- a/chrome/browser/supervised_user/supervised_user_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_browsertest.cc
@@ -97,7 +97,7 @@ class SupervisedUserBlockModeTest : public InProcessBrowserTest {
}
protected:
- virtual void SetUpOnMainThread() override {
+ void SetUpOnMainThread() override {
// Set up the SupervisedUserNavigationObserver manually since the profile
// was not supervised when the browser was created.
content::WebContents* web_contents =
@@ -115,7 +115,7 @@ class SupervisedUserBlockModeTest : public InProcessBrowserTest {
new base::FundamentalValue(SupervisedUserURLFilter::BLOCK)));
}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(CommandLine* command_line) override {
// Enable the test server and remap all URLs to it.
ASSERT_TRUE(test_server()->Start());
std::string host_port = test_server()->host_port_pair().ToString();
diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.cc b/chrome/browser/supervised_user/supervised_user_interstitial.cc
index 6a3bb32..e2aa9e4 100644
--- a/chrome/browser/supervised_user/supervised_user_interstitial.cc
+++ b/chrome/browser/supervised_user/supervised_user_interstitial.cc
@@ -65,7 +65,7 @@ class TabCloser : public content::WebContentsUserData<TabCloser> {
FROM_HERE,
base::Bind(&TabCloser::CloseTabImpl, weak_ptr_factory_.GetWeakPtr()));
}
- virtual ~TabCloser() {}
+ ~TabCloser() override {}
void CloseTabImpl() {
// On Android, FindBrowserWithWebContents and TabStripModel don't exist.
diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.h b/chrome/browser/supervised_user/supervised_user_interstitial.h
index b3f7368..a551900 100644
--- a/chrome/browser/supervised_user/supervised_user_interstitial.h
+++ b/chrome/browser/supervised_user/supervised_user_interstitial.h
@@ -34,18 +34,18 @@ class SupervisedUserInterstitial : public content::InterstitialPageDelegate,
SupervisedUserInterstitial(content::WebContents* web_contents,
const GURL& url,
const base::Callback<void(bool)>& callback);
- virtual ~SupervisedUserInterstitial();
+ ~SupervisedUserInterstitial() override;
bool Init();
// InterstitialPageDelegate implementation.
- virtual std::string GetHTMLContents() override;
- virtual void CommandReceived(const std::string& command) override;
- virtual void OnProceed() override;
- virtual void OnDontProceed() override;
+ std::string GetHTMLContents() override;
+ void CommandReceived(const std::string& command) override;
+ void OnProceed() override;
+ void OnDontProceed() override;
// SupervisedUserServiceObserver implementation.
- virtual void OnURLFilterChanged() override;
+ void OnURLFilterChanged() override;
// TODO(treib): Also listen to OnCustodianInfoChanged and update as required.
void OnAccessRequestAdded(bool success);
diff --git a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc
index 655222d..9114f47 100644
--- a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc
+++ b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc
@@ -85,15 +85,15 @@ class SupervisedUserWarningInfoBarDelegate : public ConfirmInfoBarDelegate {
private:
SupervisedUserWarningInfoBarDelegate();
- virtual ~SupervisedUserWarningInfoBarDelegate();
+ ~SupervisedUserWarningInfoBarDelegate() override;
// ConfirmInfoBarDelegate:
- virtual bool ShouldExpire(const NavigationDetails& details) const override;
- virtual void InfoBarDismissed() override;
- virtual base::string16 GetMessageText() const override;
- virtual int GetButtons() const override;
- virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
- virtual bool Accept() override;
+ bool ShouldExpire(const NavigationDetails& details) const override;
+ void InfoBarDismissed() override;
+ base::string16 GetMessageText() const override;
+ int GetButtons() const override;
+ base::string16 GetButtonLabel(InfoBarButton button) const override;
+ bool Accept() override;
DISALLOW_COPY_AND_ASSIGN(SupervisedUserWarningInfoBarDelegate);
};
diff --git a/chrome/browser/supervised_user/supervised_user_navigation_observer.h b/chrome/browser/supervised_user/supervised_user_navigation_observer.h
index a877251..0b654c0 100644
--- a/chrome/browser/supervised_user/supervised_user_navigation_observer.h
+++ b/chrome/browser/supervised_user/supervised_user_navigation_observer.h
@@ -29,7 +29,7 @@ class SupervisedUserNavigationObserver
: public content::WebContentsObserver,
public content::WebContentsUserData<SupervisedUserNavigationObserver> {
public:
- virtual ~SupervisedUserNavigationObserver();
+ ~SupervisedUserNavigationObserver() override;
// Sets the specific infobar as dismissed.
void WarnInfoBarDismissed();
@@ -51,7 +51,7 @@ class SupervisedUserNavigationObserver
explicit SupervisedUserNavigationObserver(content::WebContents* web_contents);
// content::WebContentsObserver implementation.
- virtual void DidCommitProvisionalLoadForFrame(
+ void DidCommitProvisionalLoadForFrame(
content::RenderFrameHost* render_frame_host,
const GURL& url,
ui::PageTransition transition_type) override;
diff --git a/chrome/browser/supervised_user/supervised_user_pref_mapping_service.h b/chrome/browser/supervised_user/supervised_user_pref_mapping_service.h
index 4075a90..5e9d866 100644
--- a/chrome/browser/supervised_user/supervised_user_pref_mapping_service.h
+++ b/chrome/browser/supervised_user/supervised_user_pref_mapping_service.h
@@ -27,10 +27,10 @@ class SupervisedUserPrefMappingService : public KeyedService {
SupervisedUserPrefMappingService(
PrefService* prefs,
SupervisedUserSharedSettingsService* shared_settings);
- virtual ~SupervisedUserPrefMappingService();
+ ~SupervisedUserPrefMappingService() override;
// KeyedService implementation:
- virtual void Shutdown() override;
+ void Shutdown() override;
void Init();
diff --git a/chrome/browser/supervised_user/supervised_user_pref_mapping_service_factory.h b/chrome/browser/supervised_user/supervised_user_pref_mapping_service_factory.h
index 70fd0cb..e156cf6 100644
--- a/chrome/browser/supervised_user/supervised_user_pref_mapping_service_factory.h
+++ b/chrome/browser/supervised_user/supervised_user_pref_mapping_service_factory.h
@@ -23,10 +23,10 @@ class SupervisedUserPrefMappingServiceFactory
friend struct DefaultSingletonTraits<SupervisedUserPrefMappingServiceFactory>;
SupervisedUserPrefMappingServiceFactory();
- virtual ~SupervisedUserPrefMappingServiceFactory();
+ ~SupervisedUserPrefMappingServiceFactory() override;
// BrowserContextKeyedServiceFactory:
- virtual KeyedService* BuildServiceInstanceFor(
+ KeyedService* BuildServiceInstanceFor(
content::BrowserContext* profile) const override;
};
diff --git a/chrome/browser/supervised_user/supervised_user_pref_store.h b/chrome/browser/supervised_user/supervised_user_pref_store.h
index 93b9a26..c8a4e81 100644
--- a/chrome/browser/supervised_user/supervised_user_pref_store.h
+++ b/chrome/browser/supervised_user/supervised_user_pref_store.h
@@ -28,15 +28,15 @@ class SupervisedUserPrefStore : public PrefStore {
SupervisedUserSettingsService* supervised_user_settings_service);
// PrefStore overrides:
- virtual bool GetValue(const std::string& key,
- const base::Value** value) 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;
+ bool GetValue(const std::string& key,
+ const base::Value** value) const override;
+ void AddObserver(PrefStore::Observer* observer) override;
+ void RemoveObserver(PrefStore::Observer* observer) override;
+ bool HasObservers() const override;
+ bool IsInitializationComplete() const override;
private:
- virtual ~SupervisedUserPrefStore();
+ ~SupervisedUserPrefStore() override;
void OnNewSettingsAvailable(const base::DictionaryValue* settings);
diff --git a/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
index 1a3685f..49ca495 100644
--- a/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
@@ -23,7 +23,7 @@ class SupervisedUserPrefStoreFixture : public PrefStore::Observer {
public:
explicit SupervisedUserPrefStoreFixture(
SupervisedUserSettingsService* settings_service);
- virtual ~SupervisedUserPrefStoreFixture();
+ ~SupervisedUserPrefStoreFixture() override;
base::DictionaryValue* changed_prefs() {
return &changed_prefs_;
@@ -34,8 +34,8 @@ class SupervisedUserPrefStoreFixture : public PrefStore::Observer {
}
// PrefStore::Observer implementation:
- virtual void OnPrefValueChanged(const std::string& key) override;
- virtual void OnInitializationCompleted(bool succeeded) override;
+ void OnPrefValueChanged(const std::string& key) override;
+ void OnInitializationCompleted(bool succeeded) override;
private:
scoped_refptr<SupervisedUserPrefStore> pref_store_;
diff --git a/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher.cc b/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher.cc
index 8605050..5c526c4 100644
--- a/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher.cc
+++ b/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher.cc
@@ -60,32 +60,32 @@ class SupervisedUserRefreshTokenFetcherImpl
const std::string& account_id,
const std::string& device_id,
URLRequestContextGetter* context);
- virtual ~SupervisedUserRefreshTokenFetcherImpl();
+ ~SupervisedUserRefreshTokenFetcherImpl() override;
// SupervisedUserRefreshTokenFetcher implementation:
- virtual void Start(const std::string& supervised_user_id,
- const std::string& device_name,
- const TokenCallback& callback) override;
+ void Start(const std::string& supervised_user_id,
+ const std::string& device_name,
+ const TokenCallback& callback) override;
protected:
// OAuth2TokenService::Consumer implementation:
- virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
- const std::string& access_token,
- const Time& expiration_time) override;
- virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
- const GoogleServiceAuthError& error) override;
+ void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+ const std::string& access_token,
+ const Time& expiration_time) override;
+ void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+ const GoogleServiceAuthError& error) override;
// net::URLFetcherDelegate implementation.
- virtual void OnURLFetchComplete(const URLFetcher* source) override;
+ void OnURLFetchComplete(const URLFetcher* source) override;
// GaiaOAuthClient::Delegate implementation:
- 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;
private:
// Requests an access token, which is the first thing we need. This is where
diff --git a/chrome/browser/supervised_user/supervised_user_registration_utility.cc b/chrome/browser/supervised_user/supervised_user_registration_utility.cc
index 8be4ec1..16de28f 100644
--- a/chrome/browser/supervised_user/supervised_user_registration_utility.cc
+++ b/chrome/browser/supervised_user/supervised_user_registration_utility.cc
@@ -49,7 +49,7 @@ class SupervisedUserRegistrationUtilityImpl
SupervisedUserSyncService* service,
SupervisedUserSharedSettingsService* shared_settings_service);
- virtual ~SupervisedUserRegistrationUtilityImpl();
+ ~SupervisedUserRegistrationUtilityImpl() override;
// Registers a new supervised user with the server. |supervised_user_id| is a
// new unique ID for the new supervised user. If its value is the same as that
@@ -59,15 +59,15 @@ class SupervisedUserRegistrationUtilityImpl
// the user and his avatar. |callback| is called with the result of the
// registration. We use the info here and not the profile, because on Chrome
// OS the profile of the supervised user does not yet exist.
- virtual void Register(const std::string& supervised_user_id,
- const SupervisedUserRegistrationInfo& info,
- const RegistrationCallback& callback) override;
+ void Register(const std::string& supervised_user_id,
+ const SupervisedUserRegistrationInfo& info,
+ const RegistrationCallback& callback) override;
// SupervisedUserSyncServiceObserver:
- virtual void OnSupervisedUserAcknowledged(
+ void OnSupervisedUserAcknowledged(
const std::string& supervised_user_id) override;
- virtual void OnSupervisedUsersSyncingStopped() override;
- virtual void OnSupervisedUsersChanged() override;
+ void OnSupervisedUsersSyncingStopped() override;
+ void OnSupervisedUsersChanged() override;
private:
// Fetches the supervised user token when we have the device name.
diff --git a/chrome/browser/supervised_user/supervised_user_registration_utility_stub.h b/chrome/browser/supervised_user/supervised_user_registration_utility_stub.h
index 842ef11..aebc84d 100644
--- a/chrome/browser/supervised_user/supervised_user_registration_utility_stub.h
+++ b/chrome/browser/supervised_user/supervised_user_registration_utility_stub.h
@@ -17,11 +17,11 @@ class SupervisedUserRegistrationUtilityStub
: public SupervisedUserRegistrationUtility {
public:
SupervisedUserRegistrationUtilityStub();
- virtual ~SupervisedUserRegistrationUtilityStub();
+ ~SupervisedUserRegistrationUtilityStub() override;
- virtual void Register(const std::string& supervised_user_id,
- const SupervisedUserRegistrationInfo& info,
- const RegistrationCallback& callback) override;
+ void Register(const std::string& supervised_user_id,
+ const SupervisedUserRegistrationInfo& info,
+ const RegistrationCallback& callback) override;
bool register_was_called() { return register_was_called_; }
diff --git a/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc b/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc
index ae4a66b..a5831cb 100644
--- a/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc
@@ -46,15 +46,13 @@ const char kSupervisedUserToken[] = "supervisedusertoken";
class MockChangeProcessor : public SyncChangeProcessor {
public:
MockChangeProcessor() {}
- virtual ~MockChangeProcessor() {}
+ ~MockChangeProcessor() override {}
// SyncChangeProcessor implementation:
- virtual SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
- const SyncChangeList& change_list) override;
+ SyncError ProcessSyncChanges(const tracked_objects::Location& from_here,
+ const SyncChangeList& change_list) override;
- virtual SyncDataList GetAllSyncData(syncer::ModelType type) const
- override {
+ SyncDataList GetAllSyncData(syncer::ModelType type) const override {
return SyncDataList();
}
@@ -75,12 +73,12 @@ class MockSupervisedUserRefreshTokenFetcher
: public SupervisedUserRefreshTokenFetcher {
public:
MockSupervisedUserRefreshTokenFetcher() {}
- virtual ~MockSupervisedUserRefreshTokenFetcher() {}
+ ~MockSupervisedUserRefreshTokenFetcher() override {}
// SupervisedUserRefreshTokenFetcher implementation:
- virtual void Start(const std::string& supervised_user_id,
- const std::string& device_name,
- const TokenCallback& callback) override {
+ void Start(const std::string& supervised_user_id,
+ const std::string& device_name,
+ const TokenCallback& callback) override {
GoogleServiceAuthError error(GoogleServiceAuthError::NONE);
callback.Run(error, kSupervisedUserToken);
}
diff --git a/chrome/browser/supervised_user/supervised_user_resource_throttle.h b/chrome/browser/supervised_user/supervised_user_resource_throttle.h
index 275f9cd..c1e6df1 100644
--- a/chrome/browser/supervised_user/supervised_user_resource_throttle.h
+++ b/chrome/browser/supervised_user/supervised_user_resource_throttle.h
@@ -21,14 +21,14 @@ class SupervisedUserResourceThrottle : public content::ResourceThrottle {
SupervisedUserResourceThrottle(const net::URLRequest* request,
bool is_main_frame,
const SupervisedUserURLFilter* url_filter);
- virtual ~SupervisedUserResourceThrottle();
+ ~SupervisedUserResourceThrottle() override;
// content::ResourceThrottle implementation:
- virtual void WillStartRequest(bool* defer) override;
+ void WillStartRequest(bool* defer) override;
- virtual void WillRedirectRequest(const GURL& new_url, bool* defer) override;
+ void WillRedirectRequest(const GURL& new_url, bool* defer) override;
- virtual const char* GetNameForLogging() const override;
+ const char* GetNameForLogging() const override;
private:
void ShowInterstitialIfNeeded(bool is_redirect,
diff --git a/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc b/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc
index e987476..ac57bcf 100644
--- a/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc
@@ -33,8 +33,8 @@ class SupervisedUserResourceThrottleTest : public InProcessBrowserTest {
virtual ~SupervisedUserResourceThrottleTest() {}
private:
- virtual void SetUpOnMainThread() override;
- virtual void SetUpCommandLine(CommandLine* command_line) override;
+ void SetUpOnMainThread() override;
+ void SetUpCommandLine(CommandLine* command_line) override;
SupervisedUserService* supervised_user_service_;
};
diff --git a/chrome/browser/supervised_user/supervised_user_service.h b/chrome/browser/supervised_user/supervised_user_service.h
index 79eb8bb..5f62466 100644
--- a/chrome/browser/supervised_user/supervised_user_service.h
+++ b/chrome/browser/supervised_user/supervised_user_service.h
@@ -91,10 +91,10 @@ class SupervisedUserService : public KeyedService,
virtual GURL GetBlacklistURL() const = 0;
};
- virtual ~SupervisedUserService();
+ ~SupervisedUserService() override;
// ProfileKeyedService override:
- virtual void Shutdown() override;
+ void Shutdown() override;
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ -179,30 +179,29 @@ class SupervisedUserService : public KeyedService,
#if defined(ENABLE_EXTENSIONS)
// extensions::ManagementPolicy::Provider implementation:
- virtual std::string GetDebugPolicyProviderName() const override;
- virtual bool UserMayLoad(const extensions::Extension* extension,
- base::string16* error) const override;
- virtual bool UserMayModifySettings(const extensions::Extension* extension,
- base::string16* error) const override;
+ std::string GetDebugPolicyProviderName() const override;
+ bool UserMayLoad(const extensions::Extension* extension,
+ base::string16* error) const override;
+ bool UserMayModifySettings(const extensions::Extension* extension,
+ base::string16* error) const override;
// extensions::ExtensionRegistryObserver implementation.
- virtual void OnExtensionLoaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension) override;
- virtual void OnExtensionUnloaded(
+ void OnExtensionLoaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension) override;
+ void OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
extensions::UnloadedExtensionInfo::Reason reason) override;
#endif
// SyncTypePreferenceProvider implementation:
- virtual syncer::ModelTypeSet GetPreferredDataTypes() const override;
+ syncer::ModelTypeSet GetPreferredDataTypes() const override;
// ProfileSyncServiceObserver implementation:
- virtual void OnStateChanged() override;
+ void OnStateChanged() override;
// chrome::BrowserListObserver implementation:
- virtual void OnBrowserSetLastActive(Browser* browser) override;
+ void OnBrowserSetLastActive(Browser* browser) override;
private:
friend class SupervisedUserServiceExtensionTestBase;
diff --git a/chrome/browser/supervised_user/supervised_user_service_browsertest.cc b/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
index 2da4175..b8cd9cb 100644
--- a/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
@@ -29,7 +29,7 @@ void TestAuthErrorCallback(const GoogleServiceAuthError& error) {}
class SupervisedUserServiceTestSupervised : public InProcessBrowserTest {
public:
// content::BrowserTestBase:
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(CommandLine* command_line) override {
command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf");
}
};
diff --git a/chrome/browser/supervised_user/supervised_user_service_factory.h b/chrome/browser/supervised_user/supervised_user_service_factory.h
index 21a3c69..46b4661 100644
--- a/chrome/browser/supervised_user/supervised_user_service_factory.h
+++ b/chrome/browser/supervised_user/supervised_user_service_factory.h
@@ -25,12 +25,12 @@ class SupervisedUserServiceFactory : public BrowserContextKeyedServiceFactory {
friend struct DefaultSingletonTraits<SupervisedUserServiceFactory>;
SupervisedUserServiceFactory();
- virtual ~SupervisedUserServiceFactory();
+ ~SupervisedUserServiceFactory() override;
// BrowserContextKeyedServiceFactory:
- virtual content::BrowserContext* GetBrowserContextToUse(
+ content::BrowserContext* GetBrowserContextToUse(
content::BrowserContext* context) const override;
- virtual KeyedService* BuildServiceInstanceFor(
+ KeyedService* BuildServiceInstanceFor(
content::BrowserContext* profile) const override;
};
diff --git a/chrome/browser/supervised_user/supervised_user_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
index 945a56c..8c3b46c 100644
--- a/chrome/browser/supervised_user/supervised_user_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
@@ -61,9 +61,7 @@ class SupervisedUserURLFilterObserver :
}
// SupervisedUserURLFilter::Observer
- virtual void OnSiteListUpdated() override {
- message_loop_runner_->Quit();
- }
+ void OnSiteListUpdated() override { message_loop_runner_->Quit(); }
private:
void Reset() {
@@ -208,7 +206,7 @@ namespace {
class MockPermissionRequestCreator : public PermissionRequestCreator {
public:
MockPermissionRequestCreator() : enabled_(false) {}
- virtual ~MockPermissionRequestCreator() {}
+ ~MockPermissionRequestCreator() override {}
void set_enabled(bool enabled) {
enabled_ = enabled;
@@ -227,13 +225,10 @@ class MockPermissionRequestCreator : public PermissionRequestCreator {
private:
// PermissionRequestCreator:
- virtual bool IsEnabled() const override {
- return enabled_;
- }
+ bool IsEnabled() const override { return enabled_; }
- virtual void CreatePermissionRequest(
- const GURL& url_requested,
- const SuccessCallback& callback) override {
+ void CreatePermissionRequest(const GURL& url_requested,
+ const SuccessCallback& callback) override {
ASSERT_TRUE(enabled_);
requested_urls_.push_back(url_requested);
callbacks_.push_back(callback);
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.h b/chrome/browser/supervised_user/supervised_user_settings_service.h
index e600c79..31be839 100644
--- a/chrome/browser/supervised_user/supervised_user_settings_service.h
+++ b/chrome/browser/supervised_user/supervised_user_settings_service.h
@@ -59,7 +59,7 @@ class SupervisedUserSettingsService : public KeyedService,
typedef base::Callback<void(const base::DictionaryValue*)> SettingsCallback;
SupervisedUserSettingsService();
- virtual ~SupervisedUserSettingsService();
+ ~SupervisedUserSettingsService() override;
// Initializes the service by loading its settings from a file underneath the
// |profile_path|. File I/O will be serialized via the
@@ -109,24 +109,23 @@ class SupervisedUserSettingsService : public KeyedService,
const base::Value& value);
// KeyedService implementation:
- virtual void Shutdown() override;
+ void Shutdown() override;
// SyncableService implementation:
- virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
+ syncer::SyncMergeResult MergeDataAndStartSyncing(
syncer::ModelType type,
const syncer::SyncDataList& initial_sync_data,
scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
- virtual void StopSyncing(syncer::ModelType type) override;
- virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
- override;
- virtual syncer::SyncError ProcessSyncChanges(
+ void StopSyncing(syncer::ModelType type) override;
+ syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
+ syncer::SyncError ProcessSyncChanges(
const tracked_objects::Location& from_here,
const syncer::SyncChangeList& change_list) override;
// PrefStore::Observer implementation:
- virtual void OnPrefValueChanged(const std::string& key) override;
- virtual void OnInitializationCompleted(bool success) override;
+ void OnPrefValueChanged(const std::string& key) override;
+ void OnInitializationCompleted(bool success) override;
private:
base::DictionaryValue* GetOrCreateDictionary(const std::string& key) const;
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service_factory.h b/chrome/browser/supervised_user/supervised_user_settings_service_factory.h
index d35530c..8b96a22 100644
--- a/chrome/browser/supervised_user/supervised_user_settings_service_factory.h
+++ b/chrome/browser/supervised_user/supervised_user_settings_service_factory.h
@@ -23,12 +23,12 @@ class SupervisedUserSettingsServiceFactory
friend struct DefaultSingletonTraits<SupervisedUserSettingsServiceFactory>;
SupervisedUserSettingsServiceFactory();
- virtual ~SupervisedUserSettingsServiceFactory();
+ ~SupervisedUserSettingsServiceFactory() override;
// BrowserContextKeyedServiceFactory:
- virtual KeyedService* BuildServiceInstanceFor(
+ KeyedService* BuildServiceInstanceFor(
content::BrowserContext* profile) const override;
- virtual content::BrowserContext* GetBrowserContextToUse(
+ content::BrowserContext* GetBrowserContextToUse(
content::BrowserContext* context) const override;
};
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
index d519f6c..934d6a9 100644
--- a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
@@ -20,10 +20,10 @@ namespace {
class MockSyncErrorFactory : public syncer::SyncErrorFactory {
public:
explicit MockSyncErrorFactory(syncer::ModelType type);
- virtual ~MockSyncErrorFactory();
+ ~MockSyncErrorFactory() override;
// SyncErrorFactory implementation:
- virtual syncer::SyncError CreateAndUploadError(
+ syncer::SyncError CreateAndUploadError(
const tracked_objects::Location& location,
const std::string& message) override;
diff --git a/chrome/browser/supervised_user/supervised_user_shared_settings_service.h b/chrome/browser/supervised_user/supervised_user_shared_settings_service.h
index a6d8436..a1d588a 100644
--- a/chrome/browser/supervised_user/supervised_user_shared_settings_service.h
+++ b/chrome/browser/supervised_user/supervised_user_shared_settings_service.h
@@ -51,7 +51,7 @@ class SupervisedUserSharedSettingsService : public KeyedService,
// |SupervisedUserSharedSettingsServiceFactory::GetForProfile(...)| instead to
// get an instance of this service in production code.
explicit SupervisedUserSharedSettingsService(PrefService* prefs);
- virtual ~SupervisedUserSharedSettingsService();
+ ~SupervisedUserSharedSettingsService() override;
// Returns the value for the given |key| and the supervised user identified by
// |su_id|. If either the supervised user or the key does not exist, NULL is
@@ -89,18 +89,17 @@ class SupervisedUserSharedSettingsService : public KeyedService,
bool acknowledged);
// KeyedService implementation:
- virtual void Shutdown() override;
+ void Shutdown() override;
// SyncableService implementation:
- virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
+ syncer::SyncMergeResult MergeDataAndStartSyncing(
syncer::ModelType type,
const syncer::SyncDataList& initial_sync_data,
scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
- virtual void StopSyncing(syncer::ModelType type) override;
- virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
- override;
- virtual syncer::SyncError ProcessSyncChanges(
+ void StopSyncing(syncer::ModelType type) override;
+ syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
+ syncer::SyncError ProcessSyncChanges(
const tracked_objects::Location& from_here,
const syncer::SyncChangeList& change_list) override;
diff --git a/chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h b/chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h
index acabdff..8f531dd 100644
--- a/chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h
+++ b/chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h
@@ -24,10 +24,10 @@ class SupervisedUserSharedSettingsServiceFactory
SupervisedUserSharedSettingsServiceFactory>;
SupervisedUserSharedSettingsServiceFactory();
- virtual ~SupervisedUserSharedSettingsServiceFactory();
+ ~SupervisedUserSharedSettingsServiceFactory() override;
// BrowserContextKeyedServiceFactory:
- virtual KeyedService* BuildServiceInstanceFor(
+ KeyedService* BuildServiceInstanceFor(
content::BrowserContext* profile) const override;
};
diff --git a/chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc
index 102a43b..72e3f8e 100644
--- a/chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc
@@ -38,10 +38,10 @@ namespace {
class MockSyncErrorFactory : public syncer::SyncErrorFactory {
public:
explicit MockSyncErrorFactory(syncer::ModelType type);
- virtual ~MockSyncErrorFactory();
+ ~MockSyncErrorFactory() override;
// SyncErrorFactory implementation:
- virtual syncer::SyncError CreateAndUploadError(
+ syncer::SyncError CreateAndUploadError(
const tracked_objects::Location& location,
const std::string& message) override;
diff --git a/chrome/browser/supervised_user/supervised_user_sync_data_type_controller.h b/chrome/browser/supervised_user/supervised_user_sync_data_type_controller.h
index 3a551c2..93f4cea 100644
--- a/chrome/browser/supervised_user/supervised_user_sync_data_type_controller.h
+++ b/chrome/browser/supervised_user/supervised_user_sync_data_type_controller.h
@@ -26,11 +26,11 @@ class SupervisedUserSyncDataTypeController
sync_driver::SyncApiComponentFactory* sync_factory,
Profile* profile);
- virtual bool ReadyForStart() const override;
+ bool ReadyForStart() const override;
private:
// DataTypeController is RefCounted.
- virtual ~SupervisedUserSyncDataTypeController();
+ ~SupervisedUserSyncDataTypeController() override;
Profile* profile_;
diff --git a/chrome/browser/supervised_user/supervised_user_sync_service.h b/chrome/browser/supervised_user/supervised_user_sync_service.h
index 9af2916..c5eb8df 100644
--- a/chrome/browser/supervised_user/supervised_user_sync_service.h
+++ b/chrome/browser/supervised_user/supervised_user_sync_service.h
@@ -46,7 +46,7 @@ class SupervisedUserSyncService : public KeyedService,
// Represents a non-existing avatar on Chrome and Chrome OS.
static const int kNoAvatar;
- virtual ~SupervisedUserSyncService();
+ ~SupervisedUserSyncService() override;
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ -107,18 +107,17 @@ class SupervisedUserSyncService : public KeyedService,
void GetSupervisedUsersAsync(const SupervisedUsersCallback& callback);
// KeyedService implementation:
- virtual void Shutdown() override;
+ void Shutdown() override;
// SyncableService implementation:
- virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
+ syncer::SyncMergeResult MergeDataAndStartSyncing(
syncer::ModelType type,
const syncer::SyncDataList& initial_sync_data,
scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
- virtual void StopSyncing(syncer::ModelType type) override;
- virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
- override;
- virtual syncer::SyncError ProcessSyncChanges(
+ void StopSyncing(syncer::ModelType type) override;
+ syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
+ syncer::SyncError ProcessSyncChanges(
const tracked_objects::Location& from_here,
const syncer::SyncChangeList& change_list) override;
diff --git a/chrome/browser/supervised_user/supervised_user_sync_service_factory.h b/chrome/browser/supervised_user/supervised_user_sync_service_factory.h
index 7a52eb2..47daab2 100644
--- a/chrome/browser/supervised_user/supervised_user_sync_service_factory.h
+++ b/chrome/browser/supervised_user/supervised_user_sync_service_factory.h
@@ -22,10 +22,10 @@ class SupervisedUserSyncServiceFactory
friend struct DefaultSingletonTraits<SupervisedUserSyncServiceFactory>;
SupervisedUserSyncServiceFactory();
- virtual ~SupervisedUserSyncServiceFactory();
+ ~SupervisedUserSyncServiceFactory() override;
// BrowserContextKeyedServiceFactory:
- virtual KeyedService* BuildServiceInstanceFor(
+ KeyedService* BuildServiceInstanceFor(
content::BrowserContext* profile) const override;
};
diff --git a/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc
index 1b5f2a7..6c50265 100644
--- a/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc
@@ -41,15 +41,13 @@ namespace {
class MockChangeProcessor : public SyncChangeProcessor {
public:
MockChangeProcessor() {}
- virtual ~MockChangeProcessor() {}
+ ~MockChangeProcessor() override {}
// SyncChangeProcessor implementation:
- virtual SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
- const SyncChangeList& change_list) override;
+ SyncError ProcessSyncChanges(const tracked_objects::Location& from_here,
+ const SyncChangeList& change_list) override;
- virtual SyncDataList GetAllSyncData(syncer::ModelType type) const
- override {
+ SyncDataList GetAllSyncData(syncer::ModelType type) const override {
return SyncDataList();
}
diff --git a/chrome/browser/supervised_user/supervised_user_theme.h b/chrome/browser/supervised_user/supervised_user_theme.h
index bbace96..85832fa 100644
--- a/chrome/browser/supervised_user/supervised_user_theme.h
+++ b/chrome/browser/supervised_user/supervised_user_theme.h
@@ -19,12 +19,12 @@ class SupervisedUserTheme : public CustomThemeSupplier {
SupervisedUserTheme();
// Overridden from CustomThemeSupplier:
- virtual bool GetColor(int id, SkColor* color) const override;
- virtual gfx::Image GetImageNamed(int id) override;
- virtual bool HasCustomImage(int id) const override;
+ bool GetColor(int id, SkColor* color) const override;
+ gfx::Image GetImageNamed(int id) override;
+ bool HasCustomImage(int id) const override;
private:
- virtual ~SupervisedUserTheme();
+ ~SupervisedUserTheme() override;
DISALLOW_COPY_AND_ASSIGN(SupervisedUserTheme);
};
diff --git a/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc b/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc
index ec8d0e1..4885b6c 100644
--- a/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc
@@ -23,9 +23,7 @@ class SupervisedUserURLFilterTest : public ::testing::Test,
}
// SupervisedUserURLFilter::Observer:
- virtual void OnSiteListUpdated() override {
- run_loop_.Quit();
- }
+ void OnSiteListUpdated() override { run_loop_.Quit(); }
protected:
bool IsURLWhitelisted(const std::string& url) {