diff options
Diffstat (limited to 'chrome/browser/ui')
41 files changed, 175 insertions, 147 deletions
diff --git a/chrome/browser/ui/ash/app_sync_ui_state.cc b/chrome/browser/ui/ash/app_sync_ui_state.cc index 78bb2b3..27d2d11 100644 --- a/chrome/browser/ui/ash/app_sync_ui_state.cc +++ b/chrome/browser/ui/ash/app_sync_ui_state.cc @@ -16,7 +16,7 @@ #include "extensions/browser/extension_system.h" #if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/users/user_manager.h" +#include "components/user_manager/user_manager.h" #endif namespace { @@ -34,7 +34,7 @@ AppSyncUIState* AppSyncUIState::Get(Profile* profile) { // static bool AppSyncUIState::ShouldObserveAppSyncForProfile(Profile* profile) { #if defined(OS_CHROMEOS) - if (chromeos::UserManager::Get()->IsLoggedInAsGuest()) + if (user_manager::UserManager::Get()->IsLoggedInAsGuest()) return false; if (!profile || profile->IsOffTheRecord()) diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc index d4daa66..9ac7946 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc @@ -29,7 +29,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" #include "chrome/browser/chromeos/display/display_configuration_observer.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" +#include "components/user_manager/user_manager.h" #endif // static @@ -52,12 +52,13 @@ bool ChromeShellDelegate::IsMultiProfilesEnabled() const { #if defined(OS_CHROMEOS) // If there is a user manager, we need to see that we can at least have 2 // simultaneous users to allow this feature. - if (!chromeos::UserManager::IsInitialized()) + if (!user_manager::UserManager::IsInitialized()) return false; - size_t admitted_users_to_be_added = - chromeos::UserManager::Get()->GetUsersAdmittedForMultiProfile().size(); + size_t admitted_users_to_be_added = user_manager::UserManager::Get() + ->GetUsersAdmittedForMultiProfile() + .size(); size_t logged_in_users = - chromeos::UserManager::Get()->GetLoggedInUsers().size(); + user_manager::UserManager::Get()->GetLoggedInUsers().size(); if (!logged_in_users) { // The shelf gets created on the login screen and as such we have to create // all multi profile items of the the system tray menu before the user logs @@ -99,7 +100,7 @@ void ChromeShellDelegate::Exit() { content::BrowserContext* ChromeShellDelegate::GetActiveBrowserContext() { #if defined(OS_CHROMEOS) - DCHECK(chromeos::UserManager::Get()->GetLoggedInUsers().size()); + DCHECK(user_manager::UserManager::Get()->GetLoggedInUsers().size()); #endif return ProfileManager::GetActiveUserProfile(); } diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc index 744fb2d..f6b4379 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc @@ -91,10 +91,10 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/browser_process.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/ui/ash/chrome_shell_delegate.h" #include "chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h" #include "chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h" +#include "components/user_manager/user_manager.h" #endif using extensions::Extension; @@ -269,14 +269,14 @@ std::string GetSourceFromAppListSource(ash::LaunchSource source) { // A class to get events from ChromeOS when a user gets changed or added. class ChromeLauncherControllerUserSwitchObserverChromeOS : public ChromeLauncherControllerUserSwitchObserver, - public chromeos::UserManager::UserSessionStateObserver, + public user_manager::UserManager::UserSessionStateObserver, content::NotificationObserver { public: ChromeLauncherControllerUserSwitchObserverChromeOS( ChromeLauncherController* controller) : controller_(controller) { - DCHECK(chromeos::UserManager::IsInitialized()); - chromeos::UserManager::Get()->AddSessionStateObserver(this); + DCHECK(user_manager::UserManager::IsInitialized()); + user_manager::UserManager::Get()->AddSessionStateObserver(this); // A UserAddedToSession notification can be sent before a profile is loaded. // Since our observers require that we have already a profile, we might have // to postpone the notification until the ProfileManager lets us know that @@ -285,10 +285,10 @@ class ChromeLauncherControllerUserSwitchObserverChromeOS content::NotificationService::AllSources()); } virtual ~ChromeLauncherControllerUserSwitchObserverChromeOS() { - chromeos::UserManager::Get()->RemoveSessionStateObserver(this); + user_manager::UserManager::Get()->RemoveSessionStateObserver(this); } - // chromeos::UserManager::UserSessionStateObserver overrides: + // user_manager::UserManager::UserSessionStateObserver overrides: virtual void UserAddedToSession( const user_manager::User* added_user) OVERRIDE; diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc index 65946a3..b9ae930 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc @@ -53,6 +53,7 @@ #include "ash/test/test_session_state_delegate.h" #include "ash/test/test_shell_delegate.h" #include "chrome/browser/chromeos/login/users/fake_user_manager.h" +#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" #include "chrome/browser/ui/apps/chrome_app_delegate.h" #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h" #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h" @@ -925,7 +926,7 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest chromeos::FakeUserManager* GetFakeUserManager() { return static_cast<chromeos::FakeUserManager*>( - chromeos::UserManager::Get()); + user_manager::UserManager::Get()); } scoped_ptr<TestingProfileManager> profile_manager_; diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc index d2a61b2..f9100aa 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc @@ -12,7 +12,6 @@ #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" @@ -20,6 +19,7 @@ #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" #include "chrome/common/pref_names.h" #include "components/user_manager/user.h" +#include "components/user_manager/user_manager.h" #include "grit/generated_resources.h" #include "ui/aura/window.h" #include "ui/base/l10n/l10n_util.h" @@ -130,7 +130,7 @@ void ExecuteVisitDesktopCommand(int command_id, aura::Window* window) { // Don't show warning dialog if any logged in user in multi-profiles // session dismissed it. const user_manager::UserList logged_in_users = - chromeos::UserManager::Get()->GetLoggedInUsers(); + user_manager::UserManager::Get()->GetLoggedInUsers(); for (user_manager::UserList::const_iterator it = logged_in_users.begin(); it != logged_in_users.end(); ++it) { diff --git a/chrome/browser/ui/ash/multi_user/multi_user_util.cc b/chrome/browser/ui/ash/multi_user/multi_user_util.cc index 9aecd93..749e29b 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_util.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_util.cc @@ -13,8 +13,8 @@ #include "google_apis/gaia/gaia_auth_util.h" #if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" +#include "components/user_manager/user_manager.h" #endif namespace multi_user_util { @@ -63,7 +63,7 @@ Profile* GetProfileFromWindow(aura::Window* window) { bool IsProfileFromActiveUser(Profile* profile) { #if defined(OS_CHROMEOS) return GetUserIDFromProfile(profile) == - chromeos::UserManager::Get()->GetActiveUser()->email(); + user_manager::UserManager::Get()->GetActiveUser()->email(); #else // In non Chrome OS configurations this will be always true since this only // makes sense in separate desktop mode. @@ -73,7 +73,7 @@ bool IsProfileFromActiveUser(Profile* profile) { const std::string& GetCurrentUserId() { #if defined(OS_CHROMEOS) - return chromeos::UserManager::Get()->GetActiveUser()->email(); + return user_manager::UserManager::Get()->GetActiveUser()->email(); #else return base::EmptyString(); #endif diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc index 126a469..097559d 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc @@ -22,7 +22,6 @@ #include "base/strings/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h" diff --git a/chrome/browser/ui/ash/screenshot_taker.cc b/chrome/browser/ui/ash/screenshot_taker.cc index 4cee448..d8fe27e 100644 --- a/chrome/browser/ui/ash/screenshot_taker.cc +++ b/chrome/browser/ui/ash/screenshot_taker.cc @@ -45,7 +45,6 @@ #include "chrome/browser/chromeos/drive/file_system_interface.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/file_manager/open_util.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chromeos/login/login_state.h" diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc index ef9f807..2f7c840 100644 --- a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc +++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc @@ -12,7 +12,6 @@ #include "chrome/browser/chromeos/login/lock/screen_locker.h" #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" @@ -23,11 +22,12 @@ #include "chromeos/dbus/session_manager_client.h" #include "chromeos/login/login_state.h" #include "components/user_manager/user.h" +#include "components/user_manager/user_manager.h" #include "google_apis/gaia/gaia_auth_util.h" SessionStateDelegateChromeos::SessionStateDelegateChromeos() : session_state_(SESSION_STATE_LOGIN_PRIMARY) { - chromeos::UserManager::Get()->AddSessionStateObserver(this); + user_manager::UserManager::Get()->AddSessionStateObserver(this); chromeos::UserAddingScreen::Get()->AddObserver(this); // LoginState is not initialized in unit_tests. @@ -39,7 +39,7 @@ SessionStateDelegateChromeos::SessionStateDelegateChromeos() } SessionStateDelegateChromeos::~SessionStateDelegateChromeos() { - chromeos::UserManager::Get()->RemoveSessionStateObserver(this); + user_manager::UserManager::Get()->RemoveSessionStateObserver(this); chromeos::UserAddingScreen::Get()->RemoveObserver(this); // LoginState is not initialized in unit_tests. @@ -51,7 +51,7 @@ content::BrowserContext* SessionStateDelegateChromeos::GetBrowserContextByIndex( ash::MultiProfileIndex index) { DCHECK_LT(index, NumberOfLoggedInUsers()); user_manager::User* user = - chromeos::UserManager::Get()->GetLRULoggedInUsers()[index]; + user_manager::UserManager::Get()->GetLRULoggedInUsers()[index]; DCHECK(user); return chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(user); } @@ -62,7 +62,7 @@ SessionStateDelegateChromeos::GetBrowserContextForWindow( const std::string& user_id = chrome::MultiUserWindowManager::GetInstance()->GetWindowOwner(window); const user_manager::User* user = - chromeos::UserManager::Get()->FindUser(user_id); + user_manager::UserManager::Get()->FindUser(user_id); DCHECK(user); return chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(user); } @@ -77,16 +77,16 @@ int SessionStateDelegateChromeos::GetMaximumNumberOfLoggedInUsers() const { } int SessionStateDelegateChromeos::NumberOfLoggedInUsers() const { - return chromeos::UserManager::Get()->GetLoggedInUsers().size(); + return user_manager::UserManager::Get()->GetLoggedInUsers().size(); } bool SessionStateDelegateChromeos::IsActiveUserSessionStarted() const { - return chromeos::UserManager::Get()->IsSessionStarted(); + return user_manager::UserManager::Get()->IsSessionStarted(); } bool SessionStateDelegateChromeos::CanLockScreen() const { const user_manager::UserList unlock_users = - chromeos::UserManager::Get()->GetUnlockUsers(); + user_manager::UserManager::Get()->GetUnlockUsers(); return !unlock_users.empty(); } @@ -97,7 +97,7 @@ bool SessionStateDelegateChromeos::IsScreenLocked() const { bool SessionStateDelegateChromeos::ShouldLockScreenBeforeSuspending() const { const user_manager::UserList logged_in_users = - chromeos::UserManager::Get()->GetLoggedInUsers(); + user_manager::UserManager::Get()->GetLoggedInUsers(); for (user_manager::UserList::const_iterator it = logged_in_users.begin(); it != logged_in_users.end(); ++it) { @@ -140,7 +140,7 @@ SessionStateDelegateChromeos::GetSessionState() const { const user_manager::UserInfo* SessionStateDelegateChromeos::GetUserInfo( ash::MultiProfileIndex index) const { DCHECK_LT(index, NumberOfLoggedInUsers()); - return chromeos::UserManager::Get()->GetLRULoggedInUsers()[index]; + return user_manager::UserManager::Get()->GetLRULoggedInUsers()[index]; } const user_manager::UserInfo* SessionStateDelegateChromeos::GetUserInfo( @@ -162,9 +162,9 @@ void SessionStateDelegateChromeos::SwitchActiveUser( // Also check that we got a user id and not an email address. DCHECK_EQ(user_id, gaia::CanonicalizeEmail(gaia::SanitizeEmail(user_id))); - if (user_id == chromeos::UserManager::Get()->GetActiveUser()->email()) + if (user_id == user_manager::UserManager::Get()->GetActiveUser()->email()) return; - chromeos::UserManager::Get()->SwitchActiveUser(user_id); + user_manager::UserManager::Get()->SwitchActiveUser(user_id); } void SessionStateDelegateChromeos::CycleActiveUser(CycleUser cycle_user) { @@ -173,9 +173,10 @@ void SessionStateDelegateChromeos::CycleActiveUser(CycleUser cycle_user) { return; const user_manager::UserList& logged_in_users = - chromeos::UserManager::Get()->GetLoggedInUsers(); + user_manager::UserManager::Get()->GetLoggedInUsers(); - std::string user_id = chromeos::UserManager::Get()->GetActiveUser()->email(); + std::string user_id = + user_manager::UserManager::Get()->GetActiveUser()->email(); // Get an iterator positioned at the active user. user_manager::UserList::const_iterator it; @@ -206,7 +207,7 @@ void SessionStateDelegateChromeos::CycleActiveUser(CycleUser cycle_user) { } // Switch using the transformed |user_id|. - chromeos::UserManager::Get()->SwitchActiveUser(user_id); + user_manager::UserManager::Get()->SwitchActiveUser(user_id); } bool SessionStateDelegateChromeos::IsMultiProfileAllowedByPrimaryUserPolicy() diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.h b/chrome/browser/ui/ash/session_state_delegate_chromeos.h index 93f9b7da..3f9d2af 100644 --- a/chrome/browser/ui/ash/session_state_delegate_chromeos.h +++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.h @@ -10,8 +10,8 @@ #include "base/compiler_specific.h" #include "base/observer_list.h" #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chromeos/login/login_state.h" +#include "components/user_manager/user_manager.h" namespace ash { class SessionStateObserver; @@ -20,7 +20,7 @@ class SessionStateObserver; class SessionStateDelegateChromeos : public ash::SessionStateDelegate, public chromeos::LoginState::Observer, - public chromeos::UserManager::UserSessionStateObserver, + public user_manager::UserManager::UserSessionStateObserver, public chromeos::UserAddingScreen::Observer { public: SessionStateDelegateChromeos(); @@ -57,7 +57,7 @@ class SessionStateDelegateChromeos // chromeos::LoginState::Observer overrides. virtual void LoggedInStateChanged() OVERRIDE; - // chromeos::UserManager::UserSessionStateObserver: + // user_manager::UserManager::UserSessionStateObserver: virtual void ActiveUserChanged( const user_manager::User* active_user) OVERRIDE; virtual void UserAddedToSession( diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc index 2bf05dd..ec1fff7 100644 --- a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc @@ -10,6 +10,7 @@ #include "base/run_loop.h" #include "chrome/browser/chromeos/login/users/fake_user_manager.h" #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" +#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" #include "chrome/browser/chromeos/policy/policy_cert_service.h" #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" #include "chrome/browser/chromeos/policy/policy_cert_verifier.h" @@ -17,6 +18,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile_manager.h" +#include "components/user_manager/user_manager.h" #include "content/public/test/test_browser_thread_bundle.h" #include "net/cert/x509_certificate.h" #include "testing/gtest/include/gtest/gtest.h" @@ -35,7 +37,7 @@ KeyedService* CreateTestPolicyCertService(content::BrowserContext* context) { return policy::PolicyCertService::CreateForTesting( kUser, g_policy_cert_verifier_for_factory, - chromeos::UserManager::Get()).release(); + user_manager::UserManager::Get()).release(); } } // namespace @@ -85,7 +87,7 @@ class SessionStateDelegateChromeOSTest : public testing::Test { // Get the active user. const std::string& GetActiveUser() { - return chromeos::UserManager::Get()->GetActiveUser()->email(); + return user_manager::UserManager::Get()->GetActiveUser()->email(); } chromeos::FakeUserManager* user_manager() { return user_manager_; } diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc index 3c260d5..4c98092 100644 --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc @@ -56,8 +56,9 @@ #include "chrome/browser/chromeos/login/ui/login_display_host.h" #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" +#include "chrome/browser/chromeos/login/user_flow.h" +#include "chrome/browser/chromeos/login/users/chrome_user_manager.h" #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/options/network_config_view.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" @@ -96,6 +97,7 @@ #include "components/google/core/browser/google_util.h" #include "components/policy/core/common/cloud/cloud_policy_store.h" #include "components/user_manager/user.h" +#include "components/user_manager/user_manager.h" #include "components/user_manager/user_type.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_service.h" @@ -375,16 +377,20 @@ const base::string16 SystemTrayDelegateChromeOS::GetEnterpriseMessage() const { const std::string SystemTrayDelegateChromeOS::GetSupervisedUserManager() const { if (GetUserLoginStatus() != ash::user::LOGGED_IN_SUPERVISED) return std::string(); - return UserManager::Get()->GetSupervisedUserManager()->GetManagerDisplayEmail( - chromeos::UserManager::Get()->GetActiveUser()->email()); + return ChromeUserManager::Get() + ->GetSupervisedUserManager() + ->GetManagerDisplayEmail( + user_manager::UserManager::Get()->GetActiveUser()->email()); } const base::string16 SystemTrayDelegateChromeOS::GetSupervisedUserManagerName() const { if (GetUserLoginStatus() != ash::user::LOGGED_IN_SUPERVISED) return base::string16(); - return UserManager::Get()->GetSupervisedUserManager()->GetManagerDisplayName( - chromeos::UserManager::Get()->GetActiveUser()->email()); + return ChromeUserManager::Get() + ->GetSupervisedUserManager() + ->GetManagerDisplayName( + user_manager::UserManager::Get()->GetActiveUser()->email()); } const base::string16 SystemTrayDelegateChromeOS::GetSupervisedUserMessage() @@ -409,7 +415,7 @@ void SystemTrayDelegateChromeOS::ShowSettings() { } bool SystemTrayDelegateChromeOS::ShouldShowSettings() { - return UserManager::Get()->GetCurrentUserFlow()->ShouldShowSettings() && + return ChromeUserManager::Get()->GetCurrentUserFlow()->ShouldShowSettings() && !ash::Shell::GetInstance() ->session_state_delegate() ->IsInSecondaryLoginScreen(); @@ -538,22 +544,25 @@ void SystemTrayDelegateChromeOS::ShowUserLogin() { return; // Only regular users could add other users to current session. - if (UserManager::Get()->GetActiveUser()->GetType() != + if (user_manager::UserManager::Get()->GetActiveUser()->GetType() != user_manager::USER_TYPE_REGULAR) { return; } - if (static_cast<int>(UserManager::Get()->GetLoggedInUsers().size()) >= + if (static_cast<int>( + user_manager::UserManager::Get()->GetLoggedInUsers().size()) >= shell->session_state_delegate()->GetMaximumNumberOfLoggedInUsers()) return; // Launch sign in screen to add another user to current session. - if (UserManager::Get()->GetUsersAdmittedForMultiProfile().size()) { + if (user_manager::UserManager::Get() + ->GetUsersAdmittedForMultiProfile() + .size()) { // Don't show dialog if any logged in user in multi-profiles session // dismissed it. bool show_intro = true; const user_manager::UserList logged_in_users = - UserManager::Get()->GetLoggedInUsers(); + user_manager::UserManager::Get()->GetLoggedInUsers(); for (user_manager::UserList::const_iterator it = logged_in_users.begin(); it != logged_in_users.end(); ++it) { @@ -830,7 +839,8 @@ ash::tray::UserAccountsDelegate* SystemTrayDelegateChromeOS::GetUserAccountsDelegate( const std::string& user_id) { if (!accounts_delegates_.contains(user_id)) { - const user_manager::User* user = UserManager::Get()->FindUser(user_id); + const user_manager::User* user = + user_manager::UserManager::Get()->FindUser(user_id); Profile* user_profile = ProfileHelper::Get()->GetProfileByUserUnsafe(user); CHECK(user_profile); accounts_delegates_.set( @@ -949,7 +959,7 @@ void SystemTrayDelegateChromeOS::UpdateClockType() { GetSystemTrayNotifier()->NotifyDateFormatChanged(); // This also works for enterprise-managed devices because they never have // local owner. - if (chromeos::UserManager::Get()->IsCurrentUserOwner()) + if (user_manager::UserManager::Get()->IsCurrentUserOwner()) CrosSettings::Get()->SetBoolean(kSystemUse24HourClock, use_24_hour_clock); } @@ -1039,7 +1049,7 @@ void SystemTrayDelegateChromeOS::LoggedInStateChanged() { // method, as LoggedInStateChanged() is also called before the logged-in // user's profile has actually been loaded (http://crbug.com/317745). The // system tray's time format is updated at login via SetProfile(). - if (chromeos::UserManager::Get()->IsCurrentUserOwner()) { + if (user_manager::UserManager::Get()->IsCurrentUserOwner()) { CrosSettings::Get()->SetBoolean(kSystemUse24HourClock, ShouldUse24HourClock()); } diff --git a/chrome/browser/ui/ash/user_accounts_delegate_chromeos.cc b/chrome/browser/ui/ash/user_accounts_delegate_chromeos.cc index 13aa115..f71dc0e 100644 --- a/chrome/browser/ui/ash/user_accounts_delegate_chromeos.cc +++ b/chrome/browser/ui/ash/user_accounts_delegate_chromeos.cc @@ -8,7 +8,6 @@ #include <iterator> #include "base/logging.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/chromeos/ui/inline_login_dialog.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" @@ -16,6 +15,7 @@ #include "components/signin/core/browser/mutable_profile_oauth2_token_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" +#include "components/user_manager/user.h" #include "google_apis/gaia/gaia_auth_util.h" namespace chromeos { diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc index d0dc338..000c4c6 100644 --- a/chrome/browser/ui/browser_list.cc +++ b/chrome/browser/ui/browser_list.cc @@ -21,10 +21,6 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" -#if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/users/user_manager.h" -#endif - using base::UserMetricsAction; using content::WebContents; diff --git a/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc b/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc index 496da58..9257308 100644 --- a/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc +++ b/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc @@ -21,7 +21,7 @@ #include "ui/base/l10n/l10n_util.h" #if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/users/user_manager.h" +#include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/device_settings_service.h" #endif diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index fd046f8..63de334 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -73,10 +73,10 @@ #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chromeos/chromeos_switches.h" +#include "components/user_manager/user_manager.h" #endif #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) @@ -359,7 +359,8 @@ SessionStartupPref StartupBrowserCreator::GetSessionStartupPref( // in a location shared by all users and the check is meaningless. Query the // UserManager instead to determine whether the user is new. #if defined(OS_CHROMEOS) - const bool is_first_run = chromeos::UserManager::Get()->IsCurrentUserNew(); + const bool is_first_run = + user_manager::UserManager::Get()->IsCurrentUserNew(); #else const bool is_first_run = first_run::IsChromeFirstRun(); #endif diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc index 2bed91c..68bc2e1 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc @@ -34,7 +34,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/users/user_manager.h" +#include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/device_settings_service.h" #endif diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc index 0ac74e6..d2828dd 100644 --- a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc +++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc @@ -6,7 +6,6 @@ #include "ash/shell.h" #include "base/command_line.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chromeos/first_run/first_run_handler.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc index e15ba2d..5a6a77a 100644 --- a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc @@ -23,6 +23,7 @@ #include "chromeos/dbus/session_manager_client.h" #include "chromeos/network/portal_detector/network_portal_detector.h" #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" +#include "components/user_manager/user_manager.h" #include "extensions/browser/extension_system.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" @@ -204,7 +205,7 @@ void ErrorScreenHandler::HandleDiagnoseButtonClicked() { NEW_WINDOW)); InitAppSession(profile, extension_id); - UserManager::Get()->SessionStarted(); + user_manager::UserManager::Get()->SessionStarted(); LoginDisplayHostImpl::default_host()->Finalize(); } diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc index b66ae6a..7e84e9d 100644 --- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc @@ -12,7 +12,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/policy/consumer_management_service.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/chromeos/settings/cros_settings.h" @@ -21,6 +20,7 @@ #include "chrome/browser/ui/webui/signin/inline_login_ui.h" #include "chromeos/chromeos_switches.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/user_manager/user_manager.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" #include "google_apis/gaia/gaia_auth_util.h" @@ -59,7 +59,7 @@ void UpdateAuthParams(base::DictionaryValue* params, // 3. New users are allowed by owner. // 4. Supervised users are allowed by owner. bool supervised_users_allowed = - UserManager::Get()->AreSupervisedUsersAllowed(); + user_manager::UserManager::Get()->AreSupervisedUsersAllowed(); bool supervised_users_can_create = true; int message_id = -1; if (!has_users) { @@ -306,7 +306,8 @@ void GaiaScreenHandler::HandleCompleteLogin(const std::string& typed_email, } // Consumer management enrollment is in progress. - const std::string owner_email = UserManager::Get()->GetOwnerEmail(); + const std::string owner_email = + user_manager::UserManager::Get()->GetOwnerEmail(); if (typed_email != owner_email) { // Show Gaia sign-in screen again, since we only allow the owner to sign // in. diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index b88861d..138e06f 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -36,7 +36,6 @@ #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" #include "chrome/browser/chromeos/login/ui/webui_login_display.h" #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" @@ -66,6 +65,7 @@ #include "chromeos/network/network_state_handler.h" #include "chromeos/network/portal_detector/network_portal_detector.h" #include "components/user_manager/user.h" +#include "components/user_manager/user_manager.h" #include "components/user_manager/user_type.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" @@ -974,7 +974,7 @@ bool SigninScreenHandler::ShouldLoadGaia() const { // Update keyboard layout to least recently used by the user. void SigninScreenHandler::SetUserInputMethod(const std::string& username) { - UserManager* user_manager = UserManager::Get(); + user_manager::UserManager* user_manager = user_manager::UserManager::Get(); if (user_manager->IsUserLoggedIn()) { // We are on sign-in screen inside user session (adding new user to // the session or on lock screen), don't switch input methods in this case. @@ -1059,7 +1059,7 @@ void SigninScreenHandler::HandleLaunchIncognito() { } void SigninScreenHandler::HandleShowSupervisedUserCreationScreen() { - if (!UserManager::Get()->AreSupervisedUsersAllowed()) { + if (!user_manager::UserManager::Get()->AreSupervisedUsersAllowed()) { LOG(ERROR) << "Managed users not allowed."; return; } @@ -1284,7 +1284,7 @@ void SigninScreenHandler::HandleLoginUIStateChanged(const std::string& source, } void SigninScreenHandler::HandleUnlockOnLoginSuccess() { - DCHECK(UserManager::Get()->IsUserLoggedIn()); + DCHECK(user_manager::UserManager::Get()->IsUserLoggedIn()); if (ScreenLocker::default_screen_locker()) ScreenLocker::default_screen_locker()->UnlockOnLoginSuccess(); } @@ -1360,7 +1360,7 @@ bool SigninScreenHandler::AllWhitelistedUsersPresent() { cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); if (allow_new_user) return false; - UserManager* user_manager = UserManager::Get(); + user_manager::UserManager* user_manager = user_manager::UserManager::Get(); const user_manager::UserList& users = user_manager->GetUsers(); if (!delegate_ || users.size() > kMaxUsers) { return false; diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h index 2d8ffab..86d4dda 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h @@ -20,7 +20,6 @@ #include "chrome/browser/chromeos/login/screens/error_screen_actor.h" #include "chrome/browser/chromeos/login/signin_specifics.h" #include "chrome/browser/chromeos/login/ui/login_display.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/signin/screenlock_bridge.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" @@ -29,6 +28,7 @@ #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "chromeos/ime/ime_keyboard.h" #include "chromeos/network/portal_detector/network_portal_detector.h" +#include "components/user_manager/user_manager.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc index 0aa3dea..7264143 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc @@ -7,6 +7,7 @@ #include "chrome/browser/chromeos/login/users/fake_user_manager.h" #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" #include "chrome/browser/chromeos/login/users/multi_profile_user_controller_delegate.h" +#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" #include "chrome/browser/signin/screenlock_bridge.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile_manager.h" diff --git a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc index c448b7e..e9ef462 100644 --- a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc @@ -9,13 +9,14 @@ #include "base/values.h" #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h" +#include "chrome/browser/chromeos/login/users/chrome_user_manager.h" #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "chrome/common/url_constants.h" #include "chromeos/audio/chromeos_sounds.h" +#include "components/user_manager/user_manager.h" #include "components/user_manager/user_type.h" #include "google_apis/gaia/gaia_auth_util.h" #include "grit/browser_resources.h" @@ -209,7 +210,8 @@ void SupervisedUserCreationScreenHandler::PrepareToShow() {} void SupervisedUserCreationScreenHandler::Show() { scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue()); scoped_ptr<base::ListValue> users_list(new base::ListValue()); - const user_manager::UserList& users = UserManager::Get()->GetUsers(); + const user_manager::UserList& users = + user_manager::UserManager::Get()->GetUsers(); std::string owner; chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner); @@ -301,8 +303,9 @@ void SupervisedUserCreationScreenHandler::HandleImportUserSelected( void SupervisedUserCreationScreenHandler::HandleCheckSupervisedUserName( const base::string16& name) { std::string user_id; - if (NULL != UserManager::Get()->GetSupervisedUserManager()-> - FindByDisplayName(base::CollapseWhitespace(name, true))) { + if (NULL != + ChromeUserManager::Get()->GetSupervisedUserManager()->FindByDisplayName( + base::CollapseWhitespace(name, true))) { CallJS("supervisedUserNameError", name, l10n_util::GetStringUTF16( IDS_CREATE_SUPERVISED_USER_CREATE_USERNAME_ALREADY_EXISTS)); @@ -325,8 +328,9 @@ void SupervisedUserCreationScreenHandler::HandleCreateSupervisedUser( return; const base::string16 new_user_name = base::CollapseWhitespace(new_raw_user_name, true); - if (NULL != UserManager::Get()->GetSupervisedUserManager()-> - FindByDisplayName(new_user_name)) { + if (NULL != + ChromeUserManager::Get()->GetSupervisedUserManager()->FindByDisplayName( + new_user_name)) { CallJS("supervisedUserNameError", new_user_name, l10n_util::GetStringFUTF16( IDS_CREATE_SUPERVISED_USER_CREATE_USERNAME_ALREADY_EXISTS, @@ -384,7 +388,7 @@ void SupervisedUserCreationScreenHandler::HandleAuthenticateManager( gaia::SanitizeEmail(raw_manager_username); UserFlow* flow = new SupervisedUserCreationFlow(manager_username); - UserManager::Get()->SetUserFlow(manager_username, flow); + ChromeUserManager::Get()->SetUserFlow(manager_username, flow); delegate_->AuthenticateManager(manager_username, manager_password); } diff --git a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc index 8bf0287..898827b 100644 --- a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc @@ -15,13 +15,14 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/base/locale_util.h" #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "chrome/common/pref_names.h" #include "chromeos/ime/input_method_manager.h" #include "components/user_manager/user.h" +#include "components/user_manager/user_manager.h" #include "content/public/browser/web_ui.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -84,9 +85,11 @@ void TermsOfServiceScreenHandler::Show() { const std::string locale = ProfileHelper::Get() - ->GetProfileByUserUnsafe(UserManager::Get()->GetActiveUser()) + ->GetProfileByUserUnsafe( + user_manager::UserManager::Get()->GetActiveUser()) ->GetPrefs() ->GetString(prefs::kApplicationLocale); + if (locale.empty() || locale == g_browser_process->GetApplicationLocale()) { // If the user has not chosen a UI locale yet or the chosen locale matches // the current UI locale, show the screen immediately. @@ -151,7 +154,8 @@ void TermsOfServiceScreenHandler::DoShow() { std::vector<std::string> input_methods; base::SplitString( ProfileHelper::Get() - ->GetProfileByUserUnsafe(UserManager::Get()->GetActiveUser()) + ->GetProfileByUserUnsafe( + user_manager::UserManager::Get()->GetActiveUser()) ->GetPrefs() ->GetString(prefs::kLanguagePreloadEngines), ',', diff --git a/chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc b/chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc index 3257cb4..3e1727b 100644 --- a/chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc +++ b/chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc @@ -6,10 +6,10 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/user_manager/user_manager.h" #include "content/public/browser/web_ui_data_source.h" namespace chromeos { @@ -23,20 +23,22 @@ void AddAccountUITweaksLocalizedValues( CrosSettings::Get()->GetString(kDeviceOwner, &owner_email); // Translate owner's email to the display email. std::string display_email = - UserManager::Get()->GetUserDisplayEmail(owner_email); + user_manager::UserManager::Get()->GetUserDisplayEmail(owner_email); localized_strings->SetString("ownerUserId", display_email); localized_strings->SetBoolean("currentUserIsOwner", ProfileHelper::IsOwnerProfile(profile)); - localized_strings->SetBoolean("loggedInAsGuest", - UserManager::Get()->IsLoggedInAsGuest()); + localized_strings->SetBoolean( + "loggedInAsGuest", user_manager::UserManager::Get()->IsLoggedInAsGuest()); - localized_strings->SetBoolean("loggedInAsSupervisedUser", - UserManager::Get()->IsLoggedInAsSupervisedUser()); + localized_strings->SetBoolean( + "loggedInAsSupervisedUser", + user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser()); - localized_strings->SetBoolean("loggedInAsPublicAccount", - UserManager::Get()->IsLoggedInAsPublicAccount()); + localized_strings->SetBoolean( + "loggedInAsPublicAccount", + user_manager::UserManager::Get()->IsLoggedInAsPublicAccount()); } void AddAccountUITweaksLocalizedValues( diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc index ceacefd..2a611c1 100644 --- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc +++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc @@ -15,11 +15,11 @@ #include "base/strings/string_util.h" #include "base/sys_info.h" #include "base/values.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/common/extensions/extension_constants.h" #include "chromeos/chromeos_switches.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/user_manager/user_manager.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "extensions/common/extension.h" @@ -199,9 +199,8 @@ void KioskAppsHandler::OnKioskExtensionDownloadFailed( void KioskAppsHandler::OnGetConsumerKioskAutoLaunchStatus( chromeos::KioskAppManager::ConsumerKioskAutoLaunchStatus status) { initialized_ = true; - is_kiosk_enabled_ = - chromeos::UserManager::Get()->IsCurrentUserOwner() || - !base::SysInfo::IsRunningOnChromeOS(); + is_kiosk_enabled_ = user_manager::UserManager::Get()->IsCurrentUserOwner() || + !base::SysInfo::IsRunningOnChromeOS(); is_auto_launch_enabled_ = status == KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_ENABLED || diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc index 64fe3d9..5301a5b 100644 --- a/chrome/browser/ui/webui/flags_ui.cc +++ b/chrome/browser/ui/webui/flags_ui.cc @@ -34,7 +34,6 @@ #if defined(OS_CHROMEOS) #include "base/sys_info.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/ownership/owner_settings_service.h" #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h" #include "chrome/browser/chromeos/settings/cros_settings.h" @@ -42,6 +41,7 @@ #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/session_manager_client.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/user_manager/user_manager.h" #endif using content::WebContents; @@ -75,7 +75,7 @@ content::WebUIDataSource* CreateFlagsUIHTMLSource() { source->AddLocalizedString("enable", IDS_FLAGS_ENABLE); #if defined(OS_CHROMEOS) - if (!chromeos::UserManager::Get()->IsCurrentUserOwner() && + if (!user_manager::UserManager::Get()->IsCurrentUserOwner() && base::SysInfo::IsRunningOnChromeOS()) { // Set the strings to show which user can actually change the flags. std::string owner; @@ -231,9 +231,10 @@ void FlagsDOMHandler::HandleRestartBrowser(const base::ListValue* args) { // argv[0] is the program name |CommandLine::NO_PROGRAM|. flags.assign(user_flags.argv().begin() + 1, user_flags.argv().end()); VLOG(1) << "Restarting to apply per-session flags..."; - chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> - SetFlagsForUser(chromeos::UserManager::Get()->GetActiveUser()->email(), - flags); + chromeos::DBusThreadManager::Get() + ->GetSessionManagerClient() + ->SetFlagsForUser( + user_manager::UserManager::Get()->GetActiveUser()->email(), flags); #endif chrome::AttemptRestart(); } diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc index 9fca84e..5ec3aa5 100644 --- a/chrome/browser/ui/webui/help/help_handler.cc +++ b/chrome/browser/ui/webui/help/help_handler.cc @@ -44,7 +44,6 @@ #include "base/i18n/time_formatting.h" #include "base/prefs/pref_service.h" #include "base/sys_info.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/profiles/profile.h" @@ -52,6 +51,7 @@ #include "chromeos/chromeos_switches.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" +#include "components/user_manager/user_manager.h" #endif using base::ListValue; @@ -92,14 +92,15 @@ bool CanChangeChannel() { return false; // Get the currently logged in user and strip the domain part only. std::string domain = ""; - std::string user = chromeos::UserManager::Get()->GetLoggedInUser()->email(); + std::string user = + user_manager::UserManager::Get()->GetLoggedInUser()->email(); size_t at_pos = user.find('@'); if (at_pos != std::string::npos && at_pos + 1 < user.length()) domain = user.substr(user.find('@') + 1); policy::BrowserPolicyConnectorChromeOS* connector = g_browser_process->platform_part()->browser_policy_connector_chromeos(); return domain == connector->GetEnterpriseDomain(); - } else if (chromeos::UserManager::Get()->IsCurrentUserOwner()) { + } else if (user_manager::UserManager::Get()->IsCurrentUserOwner()) { // On non managed machines we have local owner who is the only one to change // anything. Ensure that ReleaseChannelDelegated is false. return !value; @@ -430,7 +431,7 @@ void HelpHandler::SetChannel(const base::ListValue* args) { version_updater_->SetChannel(base::UTF16ToUTF8(channel), is_powerwash_allowed); - if (chromeos::UserManager::Get()->IsCurrentUserOwner()) { + if (user_manager::UserManager::Get()->IsCurrentUserOwner()) { // Check for update after switching release channel. version_updater_->CheckForUpdate(base::Bind(&HelpHandler::SetUpdateStatus, base::Unretained(this))); diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.cc b/chrome/browser/ui/webui/help/version_updater_chromeos.cc index e6c2f2a..ac87357 100644 --- a/chrome/browser/ui/webui/help/version_updater_chromeos.cc +++ b/chrome/browser/ui/webui/help/version_updater_chromeos.cc @@ -10,7 +10,6 @@ #include "base/bind_helpers.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/startup_utils.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/ui/webui/help/help_utils_chromeos.h" @@ -20,6 +19,7 @@ #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/user_manager/user_manager.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -28,7 +28,7 @@ using chromeos::CrosSettings; using chromeos::DBusThreadManager; using chromeos::UpdateEngineClient; -using chromeos::UserManager; +using user_manager::UserManager; using chromeos::WizardController; namespace { @@ -128,7 +128,7 @@ void VersionUpdaterCros::RelaunchBrowser() const { void VersionUpdaterCros::SetChannel(const std::string& channel, bool is_powerwash_allowed) { - if (UserManager::Get()->IsCurrentUserOwner()) { + if (user_manager::UserManager::Get()->IsCurrentUserOwner()) { // For local owner set the field in the policy blob. CrosSettings::Get()->SetString(chromeos::kReleaseChannel, channel); } diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 84f0263..d33ad33 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -105,7 +105,6 @@ #include "ash/shell.h" #include "chrome/browser/chromeos/accessibility/accessibility_util.h" #include "chrome/browser/chromeos/chromeos_utils.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" @@ -122,6 +121,7 @@ #include "components/policy/core/common/policy_namespace.h" #include "components/policy/core/common/policy_service.h" #include "components/user_manager/user.h" +#include "components/user_manager/user_manager.h" #include "policy/policy_constants.h" #include "policy/proto/device_management_backend.pb.h" #include "ui/gfx/image/image_skia.h" @@ -942,8 +942,8 @@ void BrowserOptionsHandler::InitializePage() { policy::BrowserPolicyConnectorChromeOS* connector = g_browser_process->platform_part()->browser_policy_connector_chromeos(); if (!connector->IsEnterpriseManaged() && - !chromeos::UserManager::Get()->IsLoggedInAsGuest() && - !chromeos::UserManager::Get()->IsLoggedInAsSupervisedUser()) { + !user_manager::UserManager::Get()->IsLoggedInAsGuest() && + !user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser()) { web_ui()->CallJavascriptFunction( "BrowserOptions.enableFactoryResetSection"); } @@ -958,7 +958,7 @@ void BrowserOptionsHandler::InitializePage() { OnWallpaperManagedChanged( chromeos::WallpaperManager::Get()->IsPolicyControlled( - chromeos::UserManager::Get()->GetActiveUser()->email())); + user_manager::UserManager::Get()->GetActiveUser()->email())); #endif } @@ -1351,7 +1351,8 @@ void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) { #if defined(OS_CHROMEOS) void BrowserOptionsHandler::UpdateAccountPicture() { - std::string email = chromeos::UserManager::Get()->GetLoggedInUser()->email(); + std::string email = + user_manager::UserManager::Get()->GetLoggedInUser()->email(); if (!email.empty()) { web_ui()->CallJavascriptFunction("BrowserOptions.updateAccountPicture"); base::StringValue email_value(email); diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc index f2b4880..db1d4fa 100644 --- a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc +++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc @@ -8,7 +8,6 @@ #include "chrome/browser/chromeos/login/login_manager_test.h" #include "chrome/browser/chromeos/login/startup_utils.h" #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" @@ -18,6 +17,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/ui_test_utils.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/user_manager/user_manager.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" @@ -136,7 +136,7 @@ IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, MultiProfilesAccountsOptions) { content::RunAllPendingInMessageLoop(); AddUser(kTestUsers[1]); - UserManager* manager = UserManager::Get(); + user_manager::UserManager* manager = user_manager::UserManager::Get(); ASSERT_EQ(2u, manager->GetLoggedInUsers().size()); CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */); diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc index 856945f..f3c2ebb 100644 --- a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc @@ -14,11 +14,12 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #include "chrome/browser/chromeos/settings/cros_settings.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/user_manager/user_manager.h" #include "content/public/browser/web_ui.h" #include "google_apis/gaia/gaia_auth_util.h" #include "grit/generated_resources.h" @@ -115,7 +116,7 @@ void AccountsOptionsHandler::HandleUnwhitelistUser( base::StringValue canonical_email(gaia::CanonicalizeEmail(email)); CrosSettings::Get()->RemoveFromList(kAccountsPrefUsers, &canonical_email); - UserManager::Get()->RemoveUser(email, NULL); + user_manager::UserManager::Get()->RemoveUser(email, NULL); } void AccountsOptionsHandler::HandleWhitelistExistingUsers( @@ -134,7 +135,8 @@ void AccountsOptionsHandler::HandleWhitelistExistingUsers( else new_list.reset(new base::ListValue); - const user_manager::UserList& users = UserManager::Get()->GetUsers(); + const user_manager::UserList& users = + user_manager::UserManager::Get()->GetUsers(); for (user_manager::UserList::const_iterator it = users.begin(); it < users.end(); ++it) diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc index bf64a89..4e95b8d 100644 --- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc @@ -16,7 +16,7 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/camera_presence_notifier.h" #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" +#include "chrome/browser/chromeos/login/users/chrome_user_manager.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" @@ -28,6 +28,7 @@ #include "components/user_manager/user.h" #include "components/user_manager/user_image/default_user_images.h" #include "components/user_manager/user_image/user_image.h" +#include "components/user_manager/user_manager.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_ui.h" @@ -312,7 +313,7 @@ void ChangePictureOptionsHandler::SendProfileImage(const gfx::ImageSkia& image, void ChangePictureOptionsHandler::UpdateProfileImage() { UserImageManager* user_image_manager = - UserManager::Get()->GetUserImageManager(GetUser()->email()); + ChromeUserManager::Get()->GetUserImageManager(GetUser()->email()); // If we have a downloaded profile image and haven't sent it in // |SendSelectedImage|, send it now (without selecting). if (previous_image_index_ != user_manager::User::USER_IMAGE_PROFILE && @@ -343,7 +344,7 @@ void ChangePictureOptionsHandler::HandleSelectImage( DCHECK(!image_type.empty()); UserImageManager* user_image_manager = - UserManager::Get()->GetUserImageManager(GetUser()->email()); + ChromeUserManager::Get()->GetUserImageManager(GetUser()->email()); int image_index = user_manager::User::USER_IMAGE_INVALID; bool waiting_for_camera_photo = false; @@ -403,9 +404,9 @@ void ChangePictureOptionsHandler::HandleSelectImage( void ChangePictureOptionsHandler::FileSelected(const base::FilePath& path, int index, void* params) { - UserManager* user_manager = UserManager::Get(); - user_manager->GetUserImageManager(GetUser()->email())-> - SaveUserImageFromFile(path); + ChromeUserManager::Get() + ->GetUserImageManager(GetUser()->email()) + ->SaveUserImageFromFile(path); UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice", user_manager::kHistogramImageFromFile, user_manager::kHistogramImagesCount); @@ -414,8 +415,8 @@ void ChangePictureOptionsHandler::FileSelected(const base::FilePath& path, void ChangePictureOptionsHandler::SetImageFromCamera( const gfx::ImageSkia& photo) { - UserManager* user_manager = UserManager::Get(); - user_manager->GetUserImageManager(GetUser()->email()) + ChromeUserManager::Get() + ->GetUserImageManager(GetUser()->email()) ->SaveUserImage(user_manager::UserImage::CreateAndEncode(photo)); UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice", user_manager::kHistogramImageFromCamera, @@ -475,7 +476,7 @@ user_manager::User* ChangePictureOptionsHandler::GetUser() const { Profile* profile = Profile::FromWebUI(web_ui()); user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile); if (!user) - return UserManager::Get()->GetActiveUser(); + return user_manager::UserManager::Get()->GetActiveUser(); return user; } diff --git a/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc b/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc index 8acec3a..d1d9044 100644 --- a/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc @@ -8,10 +8,10 @@ #include "base/bind_helpers.h" #include "base/logging.h" #include "base/values.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/policy/consumer_management_service.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" +#include "components/user_manager/user_manager.h" #include "content/public/browser/web_ui.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -77,7 +77,7 @@ void ConsumerManagementHandler::RegisterMessages() { void ConsumerManagementHandler::HandleEnrollConsumerManagement( const base::ListValue* args) { - if (!chromeos::UserManager::Get()->IsCurrentUserOwner()) { + if (!user_manager::UserManager::Get()->IsCurrentUserOwner()) { LOG(ERROR) << "Received enrollConsumerManagement, but the current user is " << "not the owner."; return; diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc index c6bbe70..9795f4b 100644 --- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc @@ -16,7 +16,6 @@ #include "base/sys_info.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" @@ -27,6 +26,7 @@ #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "components/user_manager/user_manager.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" @@ -59,7 +59,7 @@ base::DictionaryValue* CreateUserInfo(const std::string& username, user_dict->SetString("name", display_email); user_dict->SetString("email", display_name); - bool is_owner = UserManager::Get()->GetOwnerEmail() == username; + bool is_owner = user_manager::UserManager::Get()->GetOwnerEmail() == username; user_dict->SetBoolean("owner", is_owner); return user_dict; } @@ -70,7 +70,7 @@ base::Value* CreateUsersWhitelist(const base::Value *pref_value) { const base::ListValue* list_value = static_cast<const base::ListValue*>(pref_value); base::ListValue* user_list = new base::ListValue(); - UserManager* user_manager = UserManager::Get(); + user_manager::UserManager* user_manager = user_manager::UserManager::Get(); for (base::ListValue::const_iterator i = list_value->begin(); i != list_value->end(); ++i) { @@ -246,7 +246,7 @@ base::Value* CoreChromeOSOptionsHandler::CreateValueForPref( // The screen lock setting is shared if multiple users are logged in and at // least one has chosen to require passwords. if (pref_name == prefs::kEnableAutoScreenLock && - UserManager::Get()->GetLoggedInUsers().size() > 1 && + user_manager::UserManager::Get()->GetLoggedInUsers().size() > 1 && controlling_pref_name.empty()) { PrefService* user_prefs = Profile::FromWebUI(web_ui())->GetPrefs(); const PrefService::Preference* pref = @@ -283,7 +283,7 @@ void CoreChromeOSOptionsHandler::GetLocalizedValues( Profile* profile = Profile::FromWebUI(web_ui()); AddAccountUITweaksLocalizedValues(localized_strings, profile); - UserManager* user_manager = UserManager::Get(); + user_manager::UserManager* user_manager = user_manager::UserManager::Get(); // Check at load time whether this is a secondary user in a multi-profile // session. diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc index e31aa31..c4f599f 100644 --- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc @@ -11,7 +11,6 @@ #include "base/values.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/lifetime/application_lifetime.h" @@ -25,6 +24,7 @@ #include "chromeos/ime/component_extension_ime_manager.h" #include "chromeos/ime/extension_ime_util.h" #include "chromeos/ime/input_method_manager.h" +#include "components/user_manager/user_manager.h" #include "components/user_manager/user_type.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/user_metrics.h" @@ -184,7 +184,7 @@ base::string16 CrosLanguageOptionsHandler::GetProductName() { void CrosLanguageOptionsHandler::SetApplicationLocale( const std::string& language_code) { Profile* profile = Profile::FromWebUI(web_ui()); - UserManager* user_manager = UserManager::Get(); + user_manager::UserManager* user_manager = user_manager::UserManager::Get(); // Secondary users and public session users cannot change the locale. user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile); diff --git a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc index 88dd983..b7dc0ec 100644 --- a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc +++ b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc @@ -9,7 +9,6 @@ #include "chrome/browser/chromeos/login/login_manager_test.h" #include "chrome/browser/chromeos/login/startup_utils.h" #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" @@ -19,6 +18,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/ui_test_utils.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/user_manager/user_manager.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" @@ -273,7 +273,7 @@ IN_PROC_BROWSER_TEST_F(SharedOptionsTest, SharedOptions) { content::RunAllPendingInMessageLoop(); AddUser(kTestNonOwner); - UserManager* manager = UserManager::Get(); + user_manager::UserManager* manager = user_manager::UserManager::Get(); ASSERT_EQ(2u, manager->GetLoggedInUsers().size()); { SCOPED_TRACE("Checking settings for owner, primary user."); @@ -304,7 +304,7 @@ IN_PROC_BROWSER_TEST_F(SharedOptionsTest, ScreenLockPreferencePrimary) { content::RunAllPendingInMessageLoop(); AddUser(kTestNonOwner); - UserManager* manager = UserManager::Get(); + user_manager::UserManager* manager = user_manager::UserManager::Get(); const user_manager::User* user1 = manager->FindUser(kTestOwner); const user_manager::User* user2 = manager->FindUser(kTestNonOwner); @@ -375,7 +375,7 @@ IN_PROC_BROWSER_TEST_F(SharedOptionsTest, ScreenLockPreferenceSecondary) { content::RunAllPendingInMessageLoop(); AddUser(kTestNonOwner); - UserManager* manager = UserManager::Get(); + user_manager::UserManager* manager = user_manager::UserManager::Get(); const user_manager::User* user1 = manager->FindUser(kTestOwner); const user_manager::User* user2 = manager->FindUser(kTestNonOwner); diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc index 54b1b46c..4ace6c1 100644 --- a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc +++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc @@ -7,9 +7,9 @@ #include "base/memory/ref_counted_memory.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_split.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/common/url_constants.h" #include "components/user_manager/user_image/default_user_images.h" +#include "components/user_manager/user_manager.h" #include "grit/theme_resources.h" #include "grit/ui_chromeos_resources.h" #include "net/base/escape.h" @@ -39,7 +39,7 @@ base::RefCountedMemory* UserImageSource::GetUserImage( const std::string& email, ui::ScaleFactor scale_factor) const { const user_manager::User* user = - chromeos::UserManager::Get()->FindUser(email); + user_manager::UserManager::Get()->FindUser(email); if (user) { if (user->has_raw_image()) { return new base::RefCountedBytes(user->raw_image()); diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 531952e..c3ad979 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -52,7 +52,7 @@ #include "ui/base/l10n/l10n_util.h" #if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/users/user_manager.h" +#include "components/user_manager/user_manager.h" #endif using base::UserMetricsAction; @@ -1316,7 +1316,7 @@ void ContentSettingsHandler::SetContentFilter(const base::ListValue* args) { #if defined(OS_CHROMEOS) // ChromeOS special case : in Guest mode settings are opened in Incognito // mode, so we need original profile to actually modify settings. - if (chromeos::UserManager::Get()->IsLoggedInAsGuest()) + if (user_manager::UserManager::Get()->IsLoggedInAsGuest()) profile = profile->GetOriginalProfile(); #endif diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc index b70dfc7..49eecaa 100644 --- a/chrome/browser/ui/webui/policy_ui.cc +++ b/chrome/browser/ui/webui/policy_ui.cc @@ -55,12 +55,12 @@ #include "ui/base/l10n/time_format.h" #if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h" +#include "components/user_manager/user_manager.h" #else #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" @@ -536,7 +536,8 @@ void PolicyUIHandler::RegisterMessages() { if (connector->IsEnterpriseManaged()) device_status_provider_.reset(new DevicePolicyStatusProvider(connector)); - const chromeos::UserManager* user_manager = chromeos::UserManager::Get(); + const user_manager::UserManager* user_manager = + user_manager::UserManager::Get(); if (user_manager->IsLoggedInAsPublicAccount()) { policy::DeviceLocalAccountPolicyService* local_account_service = connector->GetDeviceLocalAccountPolicyService(); |