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

Unified Diff: chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui.cc

Issue 6821075: Chrome-side lockbox bindings (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Addressed Ken's nits. Created 9 years, 8 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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui.cc b/chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui.cc
index 8de29a8bc84b9c9a87f9fe12b06caadabd62c61e..5b4cb245dd7a7487eff8b1f11197be23e349e414 100644
--- a/chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui.cc
@@ -288,11 +288,15 @@ void EnterpriseEnrollmentUI::RenderViewCreated(
tab_contents()->profile()->GetChromeURLDataManager()->AddDataSource(
new EnterpriseEnrollmentDataSource());
+ std::string user;
+ bool has_init_user = GetController(this)->GetInitialUser(&user);
+ if (!has_init_user)
+ user = "";
// Set the arguments for showing the gaia login page.
DictionaryValue args;
- args.SetString("user", "");
+ args.SetString("user", user);
args.SetInteger("error", 0);
- args.SetBoolean("editable_user", true);
+ args.SetBoolean("editable_user", !has_init_user);
args.SetString("initialScreen", "login-screen");
std::string json_args;
base::JSONWriter::Write(&args, false, &json_args);
« no previous file with comments | « chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698