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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 328383003: Revert of Introduce SessionManager that will contain code to start user session on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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/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 fa32096034d392640984ef88faa047cd8a50c479..79f4d84c441bab5b3dcbfe01825b136bbb50ae92 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -50,7 +50,6 @@
#include "chrome/browser/chromeos/login/lock/screen_locker.h"
#include "chrome/browser/chromeos/login/login_utils.h"
#include "chrome/browser/chromeos/login/login_wizard.h"
-#include "chrome/browser/chromeos/login/session/session_manager.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/users/user.h"
#include "chrome/browser/chromeos/login/users/user_manager.h"
@@ -162,6 +161,7 @@
if (!profile_prepared_) {
// Will call OnProfilePrepared in the end.
LoginUtils::Get()->PrepareProfile(user_context,
+ std::string(), // display_email
false, // has_cookies
true, // has_active_session
this);
@@ -236,7 +236,7 @@
// We did not log in (we crashed or are debugging), so we need to
// restore Sync.
- SessionManager::GetInstance()->RestoreAuthenticationSession(profile);
+ LoginUtils::Get()->RestoreAuthenticationSession(profile);
}
}
}
@@ -632,8 +632,8 @@
login_user);
}
- // This is done in SessionManager::OnProfileCreated during normal login.
- SessionManager::GetInstance()->InitRlz(profile());
+ // This is done in LoginUtils::OnProfileCreated during normal login.
+ LoginUtils::Get()->InitRlzDelayed(profile());
// Send the PROFILE_PREPARED notification and call SessionStarted()
// so that the Launcher and other Profile dependent classes are created.
« no previous file with comments | « chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698