| Index: chrome/browser/signin/chrome_signin_client.h
|
| diff --git a/chrome/browser/signin/chrome_signin_client.h b/chrome/browser/signin/chrome_signin_client.h
|
| index 209a62c32f70417afbc84a61855d9f3e43b3d1a3..c970f3bd3405df62955e77f367434a2ea66319dc 100644
|
| --- a/chrome/browser/signin/chrome_signin_client.h
|
| +++ b/chrome/browser/signin/chrome_signin_client.h
|
| @@ -20,7 +20,7 @@ class ChromeSigninClient : public SigninClient,
|
| public content::RenderProcessHostObserver {
|
| public:
|
| explicit ChromeSigninClient(Profile* profile);
|
| - virtual ~ChromeSigninClient();
|
| + ~ChromeSigninClient() override;
|
|
|
| // Utility methods.
|
| static bool ProfileAllowsSigninCookies(Profile* profile);
|
| @@ -34,40 +34,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 OnSignedOut() 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;
|
| + std::string GetProductVersion() override;
|
| + scoped_ptr<CookieChangedCallbackList::Subscription> AddCookieChangedCallback(
|
| + const CookieChangedCallback& callback) override;
|
| + 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;
|
| + void Observe(int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) override;
|
|
|
| private:
|
| void RegisterForCookieChangedNotification();
|
|
|