Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / profiles / profile_list_chromeos.cc

diff --git a/src/chrome/browser/chromeos/profiles/profile_list_chromeos.cc b/src/chrome/browser/chromeos/profiles/profile_list_chromeos.cc
index d154d44..d8f7591 100644 (file)
--- a/src/chrome/browser/chromeos/profiles/profile_list_chromeos.cc
+++ b/src/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,11 +43,13 @@ void ProfileListChromeOS::RebuildMenu() {
   ClearMenu();
 
   // Filter for profiles associated with logged-in users.
-  UserList users = UserManager::Get()->GetLoggedInUsers();
+  user_manager::UserList users =
+      user_manager::UserManager::Get()->GetLoggedInUsers();
 
   // Add corresponding profiles.
-  for (UserList::const_iterator it = users.begin();
-       it != users.end(); ++it) {
+  for (user_manager::UserList::const_iterator it = users.begin();
+       it != users.end();
+       ++it) {
     size_t i = profile_info_->GetIndexOfProfileWithPath(
         ProfileHelper::GetProfilePathByUserIdHash((*it)->username_hash()));