chrome/browser/chromeos/login/users/chrome_user_manager_impl.h - Issue 824683002: UserManager stack refactoring.

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

Issue 824683002: UserManager stack refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Split for FakeManager complete. Created 5 years, 11 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:

Index: chrome/browser/chromeos/login/users/chrome_user_manager_impl.h

diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h

index db1c2a5afe7aed5513383b8488743dbae22310e1..756a49d998c42591822d2bbbf830c36adb4bc8d3 100644

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

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

@@ -63,14 +63,15 @@ class ChromeUserManagerImpl

// Registers user manager preferences.

static void RegisterPrefs(PrefRegistrySimple* registry);

- // ChromeUserManager implementation:

- MultiProfileUserController* GetMultiProfileUserController() override;

- UserImageManager* GetUserImageManager(const std::string& user_id) override;

- SupervisedUserManager* GetSupervisedUserManager() override;

- UserFlow* GetCurrentUserFlow() const override;

- UserFlow* GetUserFlow(const std::string& user_id) const override;

- void SetUserFlow(const std::string& user_id, UserFlow* flow) override;

- void ResetUserFlow(const std::string& user_id) override;

+ // ChromeUserManagerInterface implementation:

+ virtual MultiProfileUserController* GetMultiProfileUserController() override;

Nikita (slow) 2015/01/20 18:18:22 nit: you don't need virtual here and below.

ygorshenin1 2015/01/20 18:33:40 Could you please remove virtual keywords here? The

merkulova 2015/01/21 14:10:33 Done.

+ virtual UserImageManager* GetUserImageManager(

+ const std::string& user_id) override;

+ virtual SupervisedUserManager* GetSupervisedUserManager() override;

+ virtual UserFlow* GetCurrentUserFlow() const override;

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

+ virtual void SetUserFlow(const std::string& user_id, UserFlow* flow) override;

+ virtual void ResetUserFlow(const std::string& user_id) override;

// UserManager implementation:

void Shutdown() override;