| Index: chrome/browser/ui/sync/one_click_signin_sync_starter.h
|
| diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.h b/chrome/browser/ui/sync/one_click_signin_sync_starter.h
|
| index c7348df38799b6e8dc05f204a6f9febba6817b8f..5b83e463f6cf6f6338046f550f780ef65c86a099 100644
|
| --- a/chrome/browser/ui/sync/one_click_signin_sync_starter.h
|
| +++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.h
|
| @@ -104,7 +104,7 @@ class OneClickSigninSyncStarter : public SigninTracker::Observer,
|
| Callback callback);
|
|
|
| // chrome::BrowserListObserver override.
|
| - virtual void OnBrowserRemoved(Browser* browser) override;
|
| + void OnBrowserRemoved(Browser* browser) override;
|
|
|
| // If the |browser| argument is non-null, returns the pointer directly.
|
| // Otherwise creates a new browser for the given profile on the given
|
| @@ -119,20 +119,19 @@ class OneClickSigninSyncStarter : public SigninTracker::Observer,
|
| FRIEND_TEST_ALL_PREFIXES(OneClickSigninSyncStarterTest, CallbackNull);
|
| FRIEND_TEST_ALL_PREFIXES(OneClickSigninSyncStarterTest, LoadContinueUrl);
|
|
|
| - virtual ~OneClickSigninSyncStarter();
|
| + ~OneClickSigninSyncStarter() override;
|
|
|
| // Initializes the internals of the OneClickSigninSyncStarter object. Can also
|
| // be used to re-initialize the object to refer to a newly created profile.
|
| void Initialize(Profile* profile, Browser* browser);
|
|
|
| // SigninTracker::Observer override.
|
| - virtual void SigninFailed(const GoogleServiceAuthError& error) override;
|
| - virtual void SigninSuccess() override;
|
| - virtual void MergeSessionComplete(
|
| - const GoogleServiceAuthError& error) override;
|
| + void SigninFailed(const GoogleServiceAuthError& error) override;
|
| + void SigninSuccess() override;
|
| + void MergeSessionComplete(const GoogleServiceAuthError& error) override;
|
|
|
| // LoginUIService::Observer override.
|
| - virtual void OnSyncConfirmationUIClosed(bool configure_sync_first) override;
|
| + void OnSyncConfirmationUIClosed(bool configure_sync_first) override;
|
|
|
| #if defined(ENABLE_CONFIGURATION_POLICY)
|
| // User input handler for the signin confirmation dialog.
|
| @@ -142,9 +141,10 @@ class OneClickSigninSyncStarter : public SigninTracker::Observer,
|
| SigninDialogDelegate(
|
| base::WeakPtr<OneClickSigninSyncStarter> sync_starter);
|
| virtual ~SigninDialogDelegate();
|
| - virtual void OnCancelSignin() override;
|
| - virtual void OnContinueSignin() override;
|
| - virtual void OnSigninWithNewProfile() override;
|
| + void OnCancelSignin() override;
|
| + void OnContinueSignin() override;
|
| + void OnSigninWithNewProfile() override;
|
| +
|
| private:
|
| base::WeakPtr<OneClickSigninSyncStarter> sync_starter_;
|
| };
|
|
|