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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 8773046: [cros] Display emails of users are stored in a separate dictionary in Local State. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index e85defbf253432a1ef0d97489854747ba89b49f5..7f857ec3c6b36ad3aabc62330238b75bac5ea024 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -504,6 +504,7 @@ class StubLogin : public chromeos::LoginStatusConsumer,
if (!profile_prepared_) {
// Will call OnProfilePrepared in the end.
chromeos::LoginUtils::Get()->PrepareProfile(username,
+ std::string(),
password,
credentials,
pending_requests,
@@ -559,9 +560,8 @@ void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line,
} else {
if (!parsed_command_line.HasSwitch(switches::kTestName)) {
// We did not log in (we crashed or are debugging), so we need to
- // set the user name for sync.
- chromeos::LoginUtils::Get()->RestoreAuthenticationSession(
- chromeos::UserManager::Get()->logged_in_user().email(), profile);
+ // restore Sync.
+ chromeos::LoginUtils::Get()->RestoreAuthenticationSession(profile);
}
}
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698