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

Unified Diff: chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc

Issue 310213003: kiosk: Ensures "Apps" menu visible on launch error. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/chromeos/login/apps_menu.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/chromeos/login/kiosk_app_menu_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
index 40e045d30baafa2c46ae2ea22e1ec16b5fa8a049..50295aa8e4c55d969d08229fa01d05dc5bcadab1 100644
--- a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
@@ -61,6 +61,9 @@ void KioskAppMenuHandler::GetLocalizedStrings(
localized_strings->SetString(
"confirmKioskAppDiagnosticModeNo",
l10n_util::GetStringUTF16(IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL));
+ localized_strings->SetBoolean(
+ "kioskAppHasLaunchError",
+ KioskAppLaunchError::Get() != KioskAppLaunchError::NONE);
}
void KioskAppMenuHandler::RegisterMessages() {
@@ -121,7 +124,6 @@ void KioskAppMenuHandler::SendKioskApps() {
apps_list.Append(app_info.release());
}
-
web_ui()->CallJavascriptFunction(EnableNewKioskUI() ?
kKioskSetAppsNewAPI : kKioskSetAppsOldAPI,
apps_list);
« no previous file with comments | « chrome/browser/resources/chromeos/login/apps_menu.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698