Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / signin / chrome_signin_client.h

diff --git a/src/chrome/browser/signin/chrome_signin_client.h b/src/chrome/browser/signin/chrome_signin_client.h
index 4712b3c..81b4abf 100644 (file)
--- a/src/chrome/browser/signin/chrome_signin_client.h
+++ b/src/chrome/browser/signin/chrome_signin_client.h
@@ -8,19 +8,16 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "components/signin/core/browser/signin_client.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/render_process_host_observer.h"
 
 class CookieSettings;
 class Profile;
 
 class ChromeSigninClient : public SigninClient,
-                           public content::NotificationObserver,
                            public content::RenderProcessHostObserver {
  public:
   explicit ChromeSigninClient(Profile* profile);
-  virtual ~ChromeSigninClient();
+  ~ChromeSigninClient() override;
 
   // Utility methods.
   static bool ProfileAllowsSigninCookies(Profile* profile);
@@ -34,51 +31,39 @@ class ChromeSigninClient : public SigninClient,
   // N.B. This is the id returned by RenderProcessHost::GetID().
   // TODO(guohui): Eliminate these APIs once the web-based signin flow is
   // replaced by a native flow. crbug.com/347247
-  virtual void SetSigninProcess(int host_id) OVERRIDE;
-  virtual void ClearSigninProcess() OVERRIDE;
-  virtual bool IsSigninProcess(int host_id) const OVERRIDE;
-  virtual bool HasSigninProcess() const OVERRIDE;
+  void SetSigninProcess(int host_id) override;
+  void ClearSigninProcess() override;
+  bool IsSigninProcess(int host_id) const override;
+  bool HasSigninProcess() const override;
 
   // content::RenderProcessHostObserver implementation.
-  virtual void RenderProcessHostDestroyed(content::RenderProcessHost* host)
-      OVERRIDE;
+  void RenderProcessHostDestroyed(content::RenderProcessHost* host) override;
 
   // SigninClient implementation.
-  virtual PrefService* GetPrefs() OVERRIDE;
-  virtual scoped_refptr<TokenWebData> GetDatabase() OVERRIDE;
-  virtual bool CanRevokeCredentials() OVERRIDE;
-  virtual std::string GetSigninScopedDeviceId() OVERRIDE;
-  virtual void ClearSigninScopedDeviceId() OVERRIDE;
-  virtual net::URLRequestContextGetter* GetURLRequestContext() OVERRIDE;
-  virtual bool ShouldMergeSigninCredentialsIntoCookieJar() OVERRIDE;
-  virtual bool IsFirstRun() const OVERRIDE;
-  virtual base::Time GetInstallDate() OVERRIDE;
+  PrefService* GetPrefs() override;
+  scoped_refptr<TokenWebData> GetDatabase() override;
+  bool CanRevokeCredentials() override;
+  std::string GetSigninScopedDeviceId() override;
+  void OnSignedOut() override;
+  net::URLRequestContextGetter* GetURLRequestContext() override;
+  bool ShouldMergeSigninCredentialsIntoCookieJar() override;
+  bool IsFirstRun() const override;
+  base::Time GetInstallDate() override;
 
   // Returns a string describing the chrome version environment. Version format:
   // <Build Info> <OS> <Version number> (<Last change>)<channel or "-devel">
   // If version information is unavailable, returns "invalid."
-  virtual std::string GetProductVersion() OVERRIDE;
-  virtual scoped_ptr<CookieChangedCallbackList::Subscription>
-      AddCookieChangedCallback(const CookieChangedCallback& callback) OVERRIDE;
-  virtual void GoogleSigninSucceeded(const std::string& account_id,
-                                     const std::string& username,
-                                     const std::string& password) OVERRIDE;
-
-  // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  std::string GetProductVersion() override;
+  scoped_ptr<CookieChangedSubscription> AddCookieChangedCallback(
+      const GURL& url,
+      const std::string& name,
+      const net::CookieStore::CookieChangedCallback& callback) override;
+  void GoogleSigninSucceeded(const std::string& account_id,
+                             const std::string& username,
+                             const std::string& password) override;
 
  private:
-  void RegisterForCookieChangedNotification();
-  void UnregisterForCookieChangedNotification();
-
   Profile* profile_;
-  content::NotificationRegistrar registrar_;
-
-  // The callbacks that will be called when notifications about cookie changes
-  // are received.
-  base::CallbackList<void(const net::CanonicalCookie* cookie)> callbacks_;
 
   // See SetSigninProcess. Tracks the currently active signin process
   // by ID, if there is one.