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

Side by Side Diff: chrome/browser/chromeos/login/users/chrome_user_manager_impl.h

Issue 600733004: Rename GetUsersAdmittedForMultiProfile to GetUsersAllowedForMultiProfile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 virtual UserImageManager* GetUserImageManager( 69 virtual UserImageManager* GetUserImageManager(
70 const std::string& user_id) OVERRIDE; 70 const std::string& user_id) OVERRIDE;
71 virtual SupervisedUserManager* GetSupervisedUserManager() OVERRIDE; 71 virtual SupervisedUserManager* GetSupervisedUserManager() OVERRIDE;
72 virtual UserFlow* GetCurrentUserFlow() const OVERRIDE; 72 virtual UserFlow* GetCurrentUserFlow() const OVERRIDE;
73 virtual UserFlow* GetUserFlow(const std::string& user_id) const OVERRIDE; 73 virtual UserFlow* GetUserFlow(const std::string& user_id) const OVERRIDE;
74 virtual void SetUserFlow(const std::string& user_id, UserFlow* flow) OVERRIDE; 74 virtual void SetUserFlow(const std::string& user_id, UserFlow* flow) OVERRIDE;
75 virtual void ResetUserFlow(const std::string& user_id) OVERRIDE; 75 virtual void ResetUserFlow(const std::string& user_id) OVERRIDE;
76 76
77 // UserManager implementation: 77 // UserManager implementation:
78 virtual void Shutdown() OVERRIDE; 78 virtual void Shutdown() OVERRIDE;
79 virtual user_manager::UserList GetUsersAdmittedForMultiProfile() 79 virtual user_manager::UserList GetUsersAllowedForMultiProfile()
80 const OVERRIDE; 80 const OVERRIDE;
81 virtual user_manager::UserList GetUnlockUsers() const OVERRIDE; 81 virtual user_manager::UserList GetUnlockUsers() const OVERRIDE;
82 virtual void SessionStarted() OVERRIDE; 82 virtual void SessionStarted() OVERRIDE;
83 virtual void SaveUserOAuthStatus( 83 virtual void SaveUserOAuthStatus(
84 const std::string& user_id, 84 const std::string& user_id,
85 user_manager::User::OAuthTokenStatus oauth_token_status) OVERRIDE; 85 user_manager::User::OAuthTokenStatus oauth_token_status) OVERRIDE;
86 virtual void SaveUserDisplayName(const std::string& user_id, 86 virtual void SaveUserDisplayName(const std::string& user_id,
87 const base::string16& display_name) OVERRIDE; 87 const base::string16& display_name) OVERRIDE;
88 virtual bool CanCurrentUserLock() const OVERRIDE; 88 virtual bool CanCurrentUserLock() const OVERRIDE;
89 virtual bool IsUserNonCryptohomeDataEphemeral( 89 virtual bool IsUserNonCryptohomeDataEphemeral(
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 wallpaper_policy_observer_; 236 wallpaper_policy_observer_;
237 237
238 base::WeakPtrFactory<ChromeUserManagerImpl> weak_factory_; 238 base::WeakPtrFactory<ChromeUserManagerImpl> weak_factory_;
239 239
240 DISALLOW_COPY_AND_ASSIGN(ChromeUserManagerImpl); 240 DISALLOW_COPY_AND_ASSIGN(ChromeUserManagerImpl);
241 }; 241 };
242 242
243 } // namespace chromeos 243 } // namespace chromeos
244 244
245 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_ 245 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698