chrome/browser/chromeos/login/users/mock_user_manager.h - Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/

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

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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

« no previous file with comments | « chrome/browser/chromeos/login/users/fake_user_manager.cc ('k') | chrome/browser/chromeos/login/users/mock_user_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 6f96e00ef4e3d5764f8b7785839190f80603db55..63ee5f4034a6b187a90ccee27083e0ffa1f13760 100644

--- a/chrome/browser/chromeos/login/users/mock_user_manager.h

+++ b/chrome/browser/chromeos/login/users/mock_user_manager.h

@@ -98,24 +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;

+ 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;

// ChromeUserManager overrides:

- virtual MultiProfileUserController* GetMultiProfileUserController() OVERRIDE;

+ virtual MultiProfileUserController* GetMultiProfileUserController() override;

virtual UserImageManager* GetUserImageManager(

- const std::string& user_id) OVERRIDE;

- virtual SupervisedUserManager* GetSupervisedUserManager() OVERRIDE;

+ const std::string& user_id) override;

+ virtual 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;

+ virtual UserFlow* GetCurrentUserFlow() const override;

+ virtual UserFlow* GetUserFlow(const std::string&) const override;

// Sets a new User instance. Users previously created by this MockUserManager

// become invalid.