diff options
author | mostynb <mostynb@opera.com> | 2014-10-06 06:57:52 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-06 13:58:09 +0000 |
commit | 4f4cf14943aba9f3ea42f631f9eb491ce0c87857 (patch) | |
tree | 1618fda16904edf449107e4088b7eb7316538816 /chromeos/login | |
parent | 71fc3adc68bb1feb651b7f38cd0a4eb777186de9 (diff) | |
download | chromium_src-4f4cf14943aba9f3ea42f631f9eb491ce0c87857.zip chromium_src-4f4cf14943aba9f3ea42f631f9eb491ce0c87857.tar.gz chromium_src-4f4cf14943aba9f3ea42f631f9eb491ce0c87857.tar.bz2 |
replace OVERRIDE and FINAL with override and final in chromeos/
BUG=417463
Review URL: https://codereview.chromium.org/628883002
Cr-Commit-Position: refs/heads/master@{#298229}
Diffstat (limited to 'chromeos/login')
-rw-r--r-- | chromeos/login/auth/cryptohome_authenticator.h | 28 | ||||
-rw-r--r-- | chromeos/login/auth/mock_authenticator.h | 26 | ||||
-rw-r--r-- | chromeos/login/auth/mock_url_fetchers.h | 12 | ||||
-rw-r--r-- | chromeos/login/auth/online_attempt.h | 4 | ||||
-rw-r--r-- | chromeos/login/auth/online_attempt_host.h | 2 | ||||
-rw-r--r-- | chromeos/login/auth/test_attempt_state.h | 14 | ||||
-rw-r--r-- | chromeos/login/login_state_unittest.cc | 6 |
7 files changed, 46 insertions, 46 deletions
diff --git a/chromeos/login/auth/cryptohome_authenticator.h b/chromeos/login/auth/cryptohome_authenticator.h index cd01ac4..980dc0f 100644 --- a/chromeos/login/auth/cryptohome_authenticator.h +++ b/chromeos/login/auth/cryptohome_authenticator.h @@ -94,7 +94,7 @@ class CHROMEOS_EXPORT CryptohomeAuthenticator // Authenticator overrides. virtual void CompleteLogin(Profile* profile, - const UserContext& user_context) OVERRIDE; + const UserContext& user_context) override; // Given |user_context|, this method attempts to authenticate to your // Chrome OS device. As soon as we have successfully mounted the encrypted @@ -105,31 +105,31 @@ class CHROMEOS_EXPORT CryptohomeAuthenticator // // Uses |profile| when doing URL fetches. virtual void AuthenticateToLogin(Profile* profile, - const UserContext& user_context) OVERRIDE; + const UserContext& user_context) override; // Given |user_context|, this method attempts to authenticate to the cached // user_context. This will never contact the server even if it's online. // The auth result is sent to AuthStatusConsumer in a same way as // AuthenticateToLogin does. - virtual void AuthenticateToUnlock(const UserContext& user_context) OVERRIDE; + virtual void AuthenticateToUnlock(const UserContext& user_context) override; // Initiates supervised user login. // Creates cryptohome if missing or mounts existing one and // notifies consumer on the success/failure. - virtual void LoginAsSupervisedUser(const UserContext& user_context) OVERRIDE; + virtual void LoginAsSupervisedUser(const UserContext& user_context) override; // Initiates retail mode login. // Mounts tmpfs and notifies consumer on the success/failure. - virtual void LoginRetailMode() OVERRIDE; + virtual void LoginRetailMode() override; // Initiates incognito ("browse without signing in") login. // Mounts tmpfs and notifies consumer on the success/failure. - virtual void LoginOffTheRecord() OVERRIDE; + virtual void LoginOffTheRecord() override; // Initiates login into a public session. // Mounts an ephemeral cryptohome and notifies consumer on the // success/failure. - virtual void LoginAsPublicSession(const UserContext& user_context) OVERRIDE; + virtual void LoginAsPublicSession(const UserContext& user_context) override; // Initiates login into the kiosk mode account identified by |app_user_id|. // Mounts an ephemeral guest cryptohome if |use_guest_mount| is |true|. @@ -137,15 +137,15 @@ class CHROMEOS_EXPORT CryptohomeAuthenticator // |DeviceEphemeralUsersEnabled| policy is enabled and non-ephemeral // otherwise. virtual void LoginAsKioskAccount(const std::string& app_user_id, - bool use_guest_mount) OVERRIDE; + bool use_guest_mount) override; // These methods must be called on the UI thread, as they make DBus calls // and also call back to the login UI. - virtual void OnRetailModeAuthSuccess() OVERRIDE; - virtual void OnAuthSuccess() OVERRIDE; - virtual void OnAuthFailure(const AuthFailure& error) OVERRIDE; - virtual void RecoverEncryptedData(const std::string& old_password) OVERRIDE; - virtual void ResyncEncryptedData() OVERRIDE; + virtual void OnRetailModeAuthSuccess() override; + virtual void OnAuthSuccess() override; + virtual void OnAuthFailure(const AuthFailure& error) override; + virtual void RecoverEncryptedData(const std::string& old_password) override; + virtual void ResyncEncryptedData() override; // AuthAttemptStateResolver overrides. // Attempts to make a decision and call back |consumer_| based on @@ -154,7 +154,7 @@ class CHROMEOS_EXPORT CryptohomeAuthenticator // When a decision is made, will call back to |consumer_| on the UI thread. // // Must be called on the UI thread. - virtual void Resolve() OVERRIDE; + virtual void Resolve() override; void OnOffTheRecordAuthSuccess(); void OnPasswordChangeDetected(); diff --git a/chromeos/login/auth/mock_authenticator.h b/chromeos/login/auth/mock_authenticator.h index 4dfec20..d887e59 100644 --- a/chromeos/login/auth/mock_authenticator.h +++ b/chromeos/login/auth/mock_authenticator.h @@ -26,21 +26,21 @@ class CHROMEOS_EXPORT MockAuthenticator : public Authenticator { // Authenticator: virtual void CompleteLogin(Profile* profile, - const UserContext& user_context) OVERRIDE; + const UserContext& user_context) override; virtual void AuthenticateToLogin(Profile* profile, - const UserContext& user_context) OVERRIDE; - virtual void AuthenticateToUnlock(const UserContext& user_context) OVERRIDE; - virtual void LoginAsSupervisedUser(const UserContext& user_context) OVERRIDE; - virtual void LoginRetailMode() OVERRIDE; - virtual void LoginOffTheRecord() OVERRIDE; - virtual void LoginAsPublicSession(const UserContext& user_context) OVERRIDE; + const UserContext& user_context) override; + virtual void AuthenticateToUnlock(const UserContext& user_context) override; + virtual void LoginAsSupervisedUser(const UserContext& user_context) override; + virtual void LoginRetailMode() override; + virtual void LoginOffTheRecord() override; + virtual void LoginAsPublicSession(const UserContext& user_context) override; virtual void LoginAsKioskAccount(const std::string& app_user_id, - bool use_guest_mount) OVERRIDE; - virtual void OnRetailModeAuthSuccess() OVERRIDE; - virtual void OnAuthSuccess() OVERRIDE; - virtual void OnAuthFailure(const AuthFailure& failure) OVERRIDE; - virtual void RecoverEncryptedData(const std::string& old_password) OVERRIDE; - virtual void ResyncEncryptedData() OVERRIDE; + bool use_guest_mount) override; + virtual void OnRetailModeAuthSuccess() override; + virtual void OnAuthSuccess() override; + virtual void OnAuthFailure(const AuthFailure& failure) override; + virtual void RecoverEncryptedData(const std::string& old_password) override; + virtual void ResyncEncryptedData() override; virtual void SetExpectedCredentials(const UserContext& user_context); diff --git a/chromeos/login/auth/mock_url_fetchers.h b/chromeos/login/auth/mock_url_fetchers.h index 703c466..cb541ee 100644 --- a/chromeos/login/auth/mock_url_fetchers.h +++ b/chromeos/login/auth/mock_url_fetchers.h @@ -32,7 +32,7 @@ class ExpectCanceledFetcher : public net::TestURLFetcher { net::URLFetcherDelegate* d); virtual ~ExpectCanceledFetcher(); - virtual void Start() OVERRIDE; + virtual void Start() override; void CompleteFetch(); @@ -50,7 +50,7 @@ class GotCanceledFetcher : public net::TestURLFetcher { net::URLFetcherDelegate* d); virtual ~GotCanceledFetcher(); - virtual void Start() OVERRIDE; + virtual void Start() override; private: DISALLOW_COPY_AND_ASSIGN(GotCanceledFetcher); @@ -65,7 +65,7 @@ class SuccessFetcher : public net::TestURLFetcher { net::URLFetcherDelegate* d); virtual ~SuccessFetcher(); - virtual void Start() OVERRIDE; + virtual void Start() override; private: DISALLOW_COPY_AND_ASSIGN(SuccessFetcher); @@ -80,7 +80,7 @@ class FailFetcher : public net::TestURLFetcher { net::URLFetcherDelegate* d); virtual ~FailFetcher(); - virtual void Start() OVERRIDE; + virtual void Start() override; private: DISALLOW_COPY_AND_ASSIGN(FailFetcher); @@ -99,7 +99,7 @@ class CaptchaFetcher : public net::TestURLFetcher { static std::string GetCaptchaUrl(); static std::string GetUnlockUrl(); - virtual void Start() OVERRIDE; + virtual void Start() override; private: static const char kCaptchaToken[]; @@ -118,7 +118,7 @@ class HostedFetcher : public net::TestURLFetcher { net::URLFetcherDelegate* d); virtual ~HostedFetcher(); - virtual void Start() OVERRIDE; + virtual void Start() override; private: DISALLOW_COPY_AND_ASSIGN(HostedFetcher); diff --git a/chromeos/login/auth/online_attempt.h b/chromeos/login/auth/online_attempt.h index 251fe0a..e03684b 100644 --- a/chromeos/login/auth/online_attempt.h +++ b/chromeos/login/auth/online_attempt.h @@ -41,9 +41,9 @@ class CHROMEOS_EXPORT OnlineAttempt : public GaiaAuthConsumer { // GaiaAuthConsumer overrides. Callbacks from GaiaAuthFetcher virtual void OnClientLoginFailure( - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; virtual void OnClientLoginSuccess( - const GaiaAuthConsumer::ClientLoginResult& credentials) OVERRIDE; + const GaiaAuthConsumer::ClientLoginResult& credentials) override; private: FRIEND_TEST_ALL_PREFIXES(OnlineAttemptTest, LoginSuccess); diff --git a/chromeos/login/auth/online_attempt_host.h b/chromeos/login/auth/online_attempt_host.h index 8d49a7b..da392450 100644 --- a/chromeos/login/auth/online_attempt_host.h +++ b/chromeos/login/auth/online_attempt_host.h @@ -50,7 +50,7 @@ class CHROMEOS_EXPORT OnlineAttemptHost : public AuthAttemptStateResolver { // AuthAttemptStateResolver overrides. // Executed on IO thread. - virtual void Resolve() OVERRIDE; + virtual void Resolve() override; // Does an actual resolve on UI thread. void ResolveOnUIThread(bool success); diff --git a/chromeos/login/auth/test_attempt_state.h b/chromeos/login/auth/test_attempt_state.h index 43e51ee..cebe9d7 100644 --- a/chromeos/login/auth/test_attempt_state.h +++ b/chromeos/login/auth/test_attempt_state.h @@ -32,13 +32,13 @@ class CHROMEOS_EXPORT TestAttemptState : public AuthAttemptState { cryptohome::MountError cryptohome_code); // To allow state to be queried on the main thread during tests. - virtual bool online_complete() OVERRIDE; - virtual const AuthFailure& online_outcome() OVERRIDE; - virtual bool is_first_time_user() OVERRIDE; - virtual GaiaAuthFetcher::HostedAccountsSetting hosted_policy() OVERRIDE; - virtual bool cryptohome_complete() OVERRIDE; - virtual bool cryptohome_outcome() OVERRIDE; - virtual cryptohome::MountError cryptohome_code() OVERRIDE; + virtual bool online_complete() override; + virtual const AuthFailure& online_outcome() override; + virtual bool is_first_time_user() override; + virtual GaiaAuthFetcher::HostedAccountsSetting hosted_policy() override; + virtual bool cryptohome_complete() override; + virtual bool cryptohome_outcome() override; + virtual cryptohome::MountError cryptohome_code() override; private: DISALLOW_COPY_AND_ASSIGN(TestAttemptState); diff --git a/chromeos/login/login_state_unittest.cc b/chromeos/login/login_state_unittest.cc index 50dfdb6..dbe448e 100644 --- a/chromeos/login/login_state_unittest.cc +++ b/chromeos/login/login_state_unittest.cc @@ -25,19 +25,19 @@ class LoginStateTest : public testing::Test, } // testing::Test - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { LoginState::Initialize(); LoginState::Get()->set_always_logged_in(false); LoginState::Get()->AddObserver(this); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { LoginState::Get()->RemoveObserver(this); LoginState::Shutdown(); } // LoginState::Observer - virtual void LoggedInStateChanged() OVERRIDE { + virtual void LoggedInStateChanged() override { ++login_state_changes_count_; logged_in_user_type_ = LoginState::Get()->GetLoggedInUserType(); } |