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

Unified Diff: chrome/browser/resources/chromeos/login/apps_menu.js

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 | « no previous file | chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/login/apps_menu.js
diff --git a/chrome/browser/resources/chromeos/login/apps_menu.js b/chrome/browser/resources/chromeos/login/apps_menu.js
index 7e7a33aab8106f09ef15f8294c13a70fff8918ed..37fa769ce121c91131e07d05012f9cfd42f79e08 100644
--- a/chrome/browser/resources/chromeos/login/apps_menu.js
+++ b/chrome/browser/resources/chromeos/login/apps_menu.js
@@ -61,7 +61,8 @@ cr.define('login', function() {
this.needsRebuild_ = false;
}
- MenuButton.prototype.showMenu.apply(this, arguments);
+ if (this.data.length > 0)
+ MenuButton.prototype.showMenu.apply(this, arguments);
},
/**
@@ -147,7 +148,8 @@ cr.define('login', function() {
*/
AppsMenuButton.setApps = function(apps) {
$('show-apps-button').data = apps;
- $('login-header-bar').hasApps = apps.length > 0;
+ $('login-header-bar').hasApps =
+ apps.length > 0 || loadTimeData.getBoolean('kioskAppHasLaunchError');
chrome.send('kioskAppsLoaded');
};
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698