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

Unified Diff: chrome/browser/chromeos/profiles/profile_list_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
Index: chrome/browser/chromeos/profiles/profile_list_chromeos.cc
diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos.cc b/chrome/browser/chromeos/profiles/profile_list_chromeos.cc
index b49bcac949c5d683cc98eefc6adba7d7dbd19908..d8f7591df7991d41c58b189b58ee524a2f4a6617 100644
--- a/chrome/browser/chromeos/profiles/profile_list_chromeos.cc
+++ b/chrome/browser/chromeos/profiles/profile_list_chromeos.cc
@@ -8,12 +8,12 @@
#include "ash/shell.h"
#include "base/command_line.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/profiles/profile_avatar_icon_util.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/chrome_switches.h"
#include "components/signin/core/common/profile_management_switches.h"
+#include "components/user_manager/user_manager.h"
// static
ProfileList* ProfileList::Create(ProfileInfoInterface* profile_cache) {
@@ -43,7 +43,8 @@ void ProfileListChromeOS::RebuildMenu() {
ClearMenu();
// Filter for profiles associated with logged-in users.
- user_manager::UserList users = UserManager::Get()->GetLoggedInUsers();
+ user_manager::UserList users =
+ user_manager::UserManager::Get()->GetLoggedInUsers();
// Add corresponding profiles.
for (user_manager::UserList::const_iterator it = users.begin();
« no previous file with comments | « chrome/browser/chromeos/profiles/profile_helper.cc ('k') | chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698