Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4482)

Unified Diff: chrome/browser/chromeos/login/users/mock_user_manager.h

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/users/mock_user_manager.h
diff --git a/chrome/browser/chromeos/login/users/mock_user_manager.h b/chrome/browser/chromeos/login/users/mock_user_manager.h
index 78a6ef91dc278e8097cd66eb4c1bfb07698359c3..c7545bc6b6e7dcfbf8a7c085e3fb82fc20e23868 100644
--- a/chrome/browser/chromeos/login/users/mock_user_manager.h
+++ b/chrome/browser/chromeos/login/users/mock_user_manager.h
@@ -98,25 +98,24 @@ class MockUserManager : public ChromeUserManager {
// You can't mock these functions easily because nobody can create
// User objects but the ChromeUserManager and us.
- virtual const user_manager::UserList& GetUsers() const override;
- virtual const user_manager::User* GetLoggedInUser() const override;
- virtual user_manager::UserList GetUnlockUsers() const override;
- virtual const std::string& GetOwnerEmail() const override;
- virtual user_manager::User* GetLoggedInUser() override;
- virtual const user_manager::User* GetActiveUser() const override;
- virtual user_manager::User* GetActiveUser() override;
- virtual const user_manager::User* GetPrimaryUser() const override;
+ const user_manager::UserList& GetUsers() const override;
+ const user_manager::User* GetLoggedInUser() const override;
+ user_manager::UserList GetUnlockUsers() const override;
+ const std::string& GetOwnerEmail() const override;
+ user_manager::User* GetLoggedInUser() override;
+ const user_manager::User* GetActiveUser() const override;
+ user_manager::User* GetActiveUser() override;
+ const user_manager::User* GetPrimaryUser() const override;
// ChromeUserManager overrides:
- virtual BootstrapManager* GetBootstrapManager() override;
- virtual MultiProfileUserController* GetMultiProfileUserController() override;
- virtual UserImageManager* GetUserImageManager(
- const std::string& user_id) override;
- virtual SupervisedUserManager* GetSupervisedUserManager() override;
+ BootstrapManager* GetBootstrapManager() override;
+ MultiProfileUserController* GetMultiProfileUserController() override;
+ UserImageManager* GetUserImageManager(const std::string& user_id) override;
+ SupervisedUserManager* GetSupervisedUserManager() override;
MOCK_METHOD2(SetUserFlow, void(const std::string&, UserFlow*));
MOCK_METHOD1(ResetUserFlow, void(const std::string&));
- virtual UserFlow* GetCurrentUserFlow() const override;
- virtual UserFlow* GetUserFlow(const std::string&) const override;
+ UserFlow* GetCurrentUserFlow() const override;
+ UserFlow* GetUserFlow(const std::string&) const override;
// Sets a new User instance. Users previously created by this MockUserManager
// become invalid.

Powered by Google App Engine
This is Rietveld 408576698