| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index 2a41869780b3a9f23f6ce4862a7175a8fba6caf1..1e59c3d32e9b12bc47cdf31283d65c5065f01599 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -469,7 +469,7 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
|
| if (immediate_login) {
|
| const std::string user_id = login::CanonicalizeUserID(
|
| parsed_command_line().GetSwitchValueASCII(switches::kLoginUser));
|
| - UserManager* user_manager = UserManager::Get();
|
| + UserManager* user_manager = GetUserManager();
|
|
|
| if (policy::IsDeviceLocalAccountUser(user_id, NULL) &&
|
| !user_manager->IsKnownUser(user_id)) {
|
| @@ -582,13 +582,13 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
|
| chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
|
| content::NotificationService::AllSources(),
|
| content::Details<Profile>(profile()));
|
| - UserManager::Get()->SessionStarted();
|
| + GetUserManager()->SessionStarted();
|
|
|
| // Now is the good time to retrieve other logged in users for this session.
|
| // First user has been already marked as logged in and active in
|
| // PreProfileInit(). Chrome should tread other user in a session as active
|
| // in the background.
|
| - UserManager::Get()->RestoreActiveSessions();
|
| + GetUserManager()->RestoreActiveSessions();
|
| }
|
|
|
| // Initialize the network portal detector for Chrome OS. The network
|
| @@ -621,7 +621,7 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
|
|
|
| // Guest user profile is never initialized with locale settings,
|
| // so we need special handling for Guest session.
|
| - if (UserManager::Get()->IsLoggedInAsGuest())
|
| + if (GetUserManager()->IsLoggedInAsGuest())
|
| SetGuestLocale(profile());
|
|
|
| // These observers must be initialized after the profile because
|
| @@ -777,7 +777,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
|
| // of the CrosSettings singleton before it is destroyed. This also ensures
|
| // that the UserManager has no URLRequest pending (see
|
| // http://crbug.com/276659).
|
| - UserManager::Get()->Shutdown();
|
| + GetUserManager()->Shutdown();
|
| WallpaperManager::Get()->Shutdown();
|
|
|
| // Let the AutomaticRebootManager unregister itself as an observer of several
|
|
|