Index: chrome/browser/extensions/api/identity/identity_api.h |
diff --git a/chrome/browser/extensions/api/identity/identity_api.h b/chrome/browser/extensions/api/identity/identity_api.h |
index 3a062b4db3b8bf74cbcaff86cae51127c9b460f5..f3dc5b014f76ef78da68e1932f19ba1188809a38 100644 |
--- a/chrome/browser/extensions/api/identity/identity_api.h |
+++ b/chrome/browser/extensions/api/identity/identity_api.h |
@@ -113,14 +113,14 @@ class IdentityAPI : public BrowserContextKeyedAPI, |
std::string FindAccountKeyByGaiaId(const std::string& gaia_id); |
// BrowserContextKeyedAPI implementation. |
- virtual void Shutdown() OVERRIDE; |
+ virtual void Shutdown() override; |
static BrowserContextKeyedAPIFactory<IdentityAPI>* GetFactoryInstance(); |
// gaia::AccountTracker::Observer implementation: |
- virtual void OnAccountAdded(const gaia::AccountIds& ids) OVERRIDE; |
- virtual void OnAccountRemoved(const gaia::AccountIds& ids) OVERRIDE; |
+ virtual void OnAccountAdded(const gaia::AccountIds& ids) override; |
+ virtual void OnAccountRemoved(const gaia::AccountIds& ids) override; |
virtual void OnAccountSignInChanged(const gaia::AccountIds& ids, |
- bool is_signed_in) OVERRIDE; |
+ bool is_signed_in) override; |
void AddShutdownObserver(ShutdownObserver* observer); |
void RemoveShutdownObserver(ShutdownObserver* observer); |
@@ -156,7 +156,7 @@ class IdentityGetAccountsFunction : public ChromeUIThreadExtensionFunction { |
virtual ~IdentityGetAccountsFunction(); |
// UIThreadExtensionFunction implementation. |
- virtual ExtensionFunction::ResponseAction Run() OVERRIDE; |
+ virtual ExtensionFunction::ResponseAction Run() override; |
}; |
// identity.getAuthToken fetches an OAuth 2 function for the |
@@ -197,15 +197,15 @@ class IdentityGetAuthTokenFunction : public ChromeAsyncExtensionFunction, |
virtual ~IdentityGetAuthTokenFunction(); |
// IdentitySigninFlow::Delegate implementation: |
- virtual void SigninSuccess() OVERRIDE; |
- virtual void SigninFailed() OVERRIDE; |
+ virtual void SigninSuccess() override; |
+ virtual void SigninFailed() override; |
// GaiaWebAuthFlow::Delegate implementation: |
virtual void OnGaiaFlowFailure(GaiaWebAuthFlow::Failure failure, |
GoogleServiceAuthError service_error, |
- const std::string& oauth_error) OVERRIDE; |
+ const std::string& oauth_error) override; |
virtual void OnGaiaFlowCompleted(const std::string& access_token, |
- const std::string& expiration) OVERRIDE; |
+ const std::string& expiration) override; |
// Starts a login access token request. |
virtual void StartLoginAccessTokenRequest(); |
@@ -213,9 +213,9 @@ class IdentityGetAuthTokenFunction : public ChromeAsyncExtensionFunction, |
// OAuth2TokenService::Consumer implementation: |
virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request, |
const std::string& access_token, |
- const base::Time& expiration_time) OVERRIDE; |
+ const base::Time& expiration_time) override; |
virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request, |
- const GoogleServiceAuthError& error) OVERRIDE; |
+ const GoogleServiceAuthError& error) override; |
scoped_ptr<OAuth2TokenService::Request> login_token_request_; |
@@ -228,7 +228,7 @@ class IdentityGetAuthTokenFunction : public ChromeAsyncExtensionFunction, |
FRIEND_TEST_ALL_PREFIXES(GetAuthTokenFunctionTest, NoninteractiveShutdown); |
// ExtensionFunction: |
- virtual bool RunAsync() OVERRIDE; |
+ virtual bool RunAsync() override; |
// Helpers to report async function results to the caller. |
void StartAsyncRun(); |
@@ -242,18 +242,18 @@ class IdentityGetAuthTokenFunction : public ChromeAsyncExtensionFunction, |
void CompleteMintTokenFlow(); |
// IdentityMintRequestQueue::Request implementation: |
- virtual void StartMintToken(IdentityMintRequestQueue::MintType type) OVERRIDE; |
+ virtual void StartMintToken(IdentityMintRequestQueue::MintType type) override; |
// OAuth2MintTokenFlow::Delegate implementation: |
virtual void OnMintTokenSuccess(const std::string& access_token, |
- int time_to_live) OVERRIDE; |
+ int time_to_live) override; |
virtual void OnMintTokenFailure( |
- const GoogleServiceAuthError& error) OVERRIDE; |
+ const GoogleServiceAuthError& error) override; |
virtual void OnIssueAdviceSuccess( |
- const IssueAdviceInfo& issue_advice) OVERRIDE; |
+ const IssueAdviceInfo& issue_advice) override; |
// IdentityAPI::ShutdownObserver implementation: |
- virtual void OnShutdown() OVERRIDE; |
+ virtual void OnShutdown() override; |
#if defined(OS_CHROMEOS) |
// Starts a login access token request for device robot account. This method |
@@ -307,7 +307,7 @@ class IdentityGetProfileUserInfoFunction |
virtual ~IdentityGetProfileUserInfoFunction(); |
// UIThreadExtensionFunction implementation. |
- virtual ExtensionFunction::ResponseAction Run() OVERRIDE; |
+ virtual ExtensionFunction::ResponseAction Run() override; |
}; |
class IdentityRemoveCachedAuthTokenFunction |
@@ -321,7 +321,7 @@ class IdentityRemoveCachedAuthTokenFunction |
virtual ~IdentityRemoveCachedAuthTokenFunction(); |
// SyncExtensionFunction implementation: |
- virtual bool RunSync() OVERRIDE; |
+ virtual bool RunSync() override; |
}; |
class IdentityLaunchWebAuthFlowFunction : public ChromeAsyncExtensionFunction, |
@@ -337,12 +337,12 @@ class IdentityLaunchWebAuthFlowFunction : public ChromeAsyncExtensionFunction, |
private: |
virtual ~IdentityLaunchWebAuthFlowFunction(); |
- virtual bool RunAsync() OVERRIDE; |
+ virtual bool RunAsync() override; |
// WebAuthFlow::Delegate implementation. |
- virtual void OnAuthFlowFailure(WebAuthFlow::Failure failure) OVERRIDE; |
- virtual void OnAuthFlowURLChange(const GURL& redirect_url) OVERRIDE; |
- virtual void OnAuthFlowTitleChange(const std::string& title) OVERRIDE {} |
+ virtual void OnAuthFlowFailure(WebAuthFlow::Failure failure) override; |
+ virtual void OnAuthFlowURLChange(const GURL& redirect_url) override; |
+ virtual void OnAuthFlowTitleChange(const std::string& title) override {} |
// Helper to initialize final URL prefix. |
void InitFinalRedirectURLPrefix(const std::string& extension_id); |