UserManager stack refactoring.

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 45 matching lines @@
       public MultiProfileUserControllerDelegate {
  public:
   ~ChromeUserManagerImpl() override;
 
   // Creates ChromeUserManagerImpl instance.
   static scoped_ptr<ChromeUserManager> CreateChromeUserManager();
 
   // 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? They're redundant since override
is specified.

[merkulova, 2015/01/21 14:10:33]

Done.

[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;
   user_manager::UserList GetUsersAllowedForMultiProfile() const override;
   user_manager::UserList GetUsersAllowedForSupervisedUsersCreation()
       const override;
   user_manager::UserList GetUnlockUsers() const override;
   void SessionStarted() override;
   void SaveUserOAuthStatus(
       const std::string& user_id,
@@ skipping 148 matching lines @@
       wallpaper_policy_observer_;
 
   base::WeakPtrFactory<ChromeUserManagerImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeUserManagerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_