Update To 11.40.268.0

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

diff --git a/src/chrome/browser/signin/android_profile_oauth2_token_service.h b/src/chrome/browser/signin/android_profile_oauth2_token_service.h
index 5f5a9a6..a878536 100644 (file)
--- a/src/chrome/browser/signin/android_profile_oauth2_token_service.h
+++ b/src/chrome/browser/signin/android_profile_oauth2_token_service.h
@@ -44,13 +44,13 @@ class AndroidProfileOAuth2TokenService : public ProfileOAuth2TokenService {
   }
 
   // ProfileOAuth2TokenService overrides:
-  virtual void Initialize(SigninClient* client) OVERRIDE;
+  virtual void Initialize(SigninClient* client) override;
   virtual bool RefreshTokenIsAvailable(
-      const std::string& account_id) const OVERRIDE;
+      const std::string& account_id) const override;
   virtual void UpdateAuthError(
       const std::string& account_id,
-      const GoogleServiceAuthError& error) OVERRIDE;
-  virtual std::vector<std::string> GetAccounts() OVERRIDE;
+      const GoogleServiceAuthError& error) override;
+  virtual std::vector<std::string> GetAccounts() override;
 
   // Lists account at the OS level.
   std::vector<std::string> GetSystemAccounts();
@@ -84,7 +84,7 @@ class AndroidProfileOAuth2TokenService : public ProfileOAuth2TokenService {
 
   // Overridden from OAuth2TokenService to complete signout of all
   // OA2TService aware accounts.
-  virtual void RevokeAllCredentials() OVERRIDE;
+  virtual void RevokeAllCredentials() override;
 
  protected:
   friend class ProfileOAuth2TokenServiceFactory;
@@ -94,23 +94,24 @@ class AndroidProfileOAuth2TokenService : public ProfileOAuth2TokenService {
   virtual OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
       const std::string& account_id,
       net::URLRequestContextGetter* getter,
-      OAuth2AccessTokenConsumer* consumer) OVERRIDE;
+      OAuth2AccessTokenConsumer* consumer) override;
 
   // Overridden from OAuth2TokenService to intercept token fetch requests and
   // redirect them to the Account Manager.
   virtual void InvalidateOAuth2Token(const std::string& account_id,
                                      const std::string& client_id,
                                      const ScopeSet& scopes,
-                                     const std::string& access_token) OVERRIDE;
+                                     const std::string& access_token) override;
 
   // Called to notify observers when a refresh token is available.
   virtual void FireRefreshTokenAvailable(
-      const std::string& account_id) OVERRIDE;
+      const std::string& account_id) override;
   // Called to notify observers when a refresh token has been revoked.
-  virtual void FireRefreshTokenRevoked(const std::string& account_id) OVERRIDE;
+  virtual void FireRefreshTokenRevoked(const std::string& account_id) override;
   // Called to notify observers when refresh tokans have been loaded.
-  virtual void FireRefreshTokensLoaded() OVERRIDE;
+  virtual void FireRefreshTokensLoaded() override;
 
+ private:
   // Return whether |signed_in_account| is valid and we have access
   // to all the tokens in |curr_account_ids|. If |force_notifications| is true,
   // TokenAvailable notifications will be sent anyway, even if the account was
@@ -122,7 +123,6 @@ class AndroidProfileOAuth2TokenService : public ProfileOAuth2TokenService {
                         std::vector<std::string>& revoked_ids,
                         bool force_notifications);
 
- private:
   base::android::ScopedJavaGlobalRef<jobject> java_ref_;
 
   static bool is_testing_profile_;