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

Unified Diff: chrome/browser/ui/webui/options/manage_profile_handler.cc

Issue 17155020: Fix some timing and display issues with the supervised-user confirmation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Re-uploading because Rietveld. Created 7 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
« no previous file with comments | « chrome/browser/resources/options/managed_user_create_confirm.js ('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/options/manage_profile_handler.cc
===================================================================
--- chrome/browser/ui/webui/options/manage_profile_handler.cc (revision 207949)
+++ chrome/browser/ui/webui/options/manage_profile_handler.cc (working copy)
@@ -92,6 +92,8 @@
{ "manageProfilesDuplicateNameError",
IDS_PROFILES_MANAGE_DUPLICATE_NAME_ERROR },
{ "manageProfilesIconLabel", IDS_PROFILES_MANAGE_ICON_LABEL },
+ { "manageProfilesManagedSignedInLabel",
+ IDS_PROFILES_CREATE_MANAGED_SIGNED_IN_LABEL },
{ "manageProfilesManagedNotSignedInLabel",
IDS_PROFILES_CREATE_MANAGED_NOT_SIGNED_IN_LABEL },
{ "manageProfilesManagedNotSignedInLink",
@@ -394,14 +396,9 @@
SigninManagerBase* manager =
SigninManagerFactory::GetForProfile(Profile::FromWebUI(web_ui()));
string16 username = UTF8ToUTF16(manager->GetAuthenticatedUsername());
- string16 text = string16();
- if (!username.empty()) {
- text = l10n_util::GetStringFUTF16(
- IDS_PROFILES_CREATE_MANAGED_SIGNED_IN_LABEL, username);
- }
- StringValue text_value(text);
+ StringValue username_value(username);
web_ui()->CallJavascriptFunction("CreateProfileOverlay.updateSignedInStatus",
- text_value);
+ username_value);
}
void ManageProfileHandler::OnHasProfileShortcuts(bool has_shortcuts) {
« no previous file with comments | « chrome/browser/resources/options/managed_user_create_confirm.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698