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

Unified Diff: chrome/browser/chromeos/login/session/chrome_session_manager.cc

Issue 2452983002: ChromeOS: This CL moves chromeos/login/user_names* to user_mananger. (Closed)
Patch Set: Removed unused #includes Created 4 years, 2 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/login/session/chrome_session_manager.cc
diff --git a/chrome/browser/chromeos/login/session/chrome_session_manager.cc b/chrome/browser/chromeos/login/session/chrome_session_manager.cc
index 26fde418705d60e3e7ebb7241cb03b33e5c79d7a..2fb7f28d37323098c181b2a3303b619cf77f3cae 100644
--- a/chrome/browser/chromeos/login/session/chrome_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/chrome_session_manager.cc
@@ -19,9 +19,9 @@
#include "chrome/browser/profiles/profile.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/cryptohome/cryptohome_parameters.h"
-#include "chromeos/login/user_names.h"
#include "components/signin/core/account_id/account_id.h"
#include "components/user_manager/user_manager.h"
+#include "components/user_manager/user_names.h"
#include "content/public/browser/notification_service.h"
namespace chromeos {
@@ -68,7 +68,7 @@ ChromeSessionManager::CreateSessionManager(
return std::unique_ptr<session_manager::SessionManager>(
new ChromeSessionManager(new LoginOobeSessionManagerDelegate()));
} else if (!base::SysInfo::IsRunningOnChromeOS() &&
- login_account_id == login::StubAccountId()) {
+ login_account_id == user_manager::StubAccountId()) {
VLOG(1) << "Starting Chrome with StubLoginSessionManagerDelegate";
return std::unique_ptr<session_manager::SessionManager>(
new ChromeSessionManager(new StubLoginSessionManagerDelegate(
@@ -80,7 +80,8 @@ ChromeSessionManager::CreateSessionManager(
// 2. Chrome is restarted for Guest session.
// 3. Chrome is started in browser_tests skipping the login flow.
// 4. Chrome is started on dev machine i.e. not on Chrome OS device w/o
- // login flow. In that case --login-user=[chromeos::login::kStubUser] is
+ // login flow. In that case
+ // --login-user=[user_manager::kStubUser] is
// added. See PreEarlyInitialization().
return std::unique_ptr<session_manager::SessionManager>(
new ChromeSessionManager(new RestoreAfterCrashSessionManagerDelegate(
« no previous file with comments | « chrome/browser/chromeos/login/login_browsertest.cc ('k') | chrome/browser/chromeos/login/session/user_session_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698