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

Unified Diff: chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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/preferences_unittest.cc ('k') | chrome/browser/chromeos/profiles/profile_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc
diff --git a/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc b/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc
index c88c50b22d813127bc041dd6981bb751d8dbfc65..a65eae28daa90474a8a1bcdbb614aaf5fee01595 100644
--- a/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc
+++ b/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc
@@ -7,9 +7,10 @@
#include "ash/multi_profile_uma.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray_delegate.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_avatar_icon_util.h"
#include "chrome/browser/ui/browser.h"
+#include "components/user_manager/user_manager.h"
// static
AvatarMenuActions* AvatarMenuActions::Create() {
@@ -38,7 +39,9 @@ void AvatarMenuActionsChromeOS::EditProfile(Profile* profile, size_t index) {
bool AvatarMenuActionsChromeOS::ShouldShowAddNewProfileLink() const {
// |browser_| can be NULL in unit_tests.
return (!browser_ || !browser_->profile()->IsSupervised()) &&
- UserManager::Get()->GetUsersAdmittedForMultiProfile().size();
+ user_manager::UserManager::Get()
+ ->GetUsersAdmittedForMultiProfile()
+ .size();
}
bool AvatarMenuActionsChromeOS::ShouldShowEditProfileLink() const {
« no previous file with comments | « chrome/browser/chromeos/preferences_unittest.cc ('k') | chrome/browser/chromeos/profiles/profile_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698