Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / sync / one_click_signin_sync_starter.h

diff --git a/src/chrome/browser/ui/sync/one_click_signin_sync_starter.h b/src/chrome/browser/ui/sync/one_click_signin_sync_starter.h
index 9b09dbe..5b83e46 100644 (file)
--- a/src/chrome/browser/ui/sync/one_click_signin_sync_starter.h
+++ b/src/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_;
   };