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

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

Issue 158833003: Represent kiosk apps as user pods instead of menu items. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: launch button, added kiosk error bubble Created 6 years, 10 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
Index: chrome/browser/resources/chromeos/login/header_bar.js
diff --git a/chrome/browser/resources/chromeos/login/header_bar.js b/chrome/browser/resources/chromeos/login/header_bar.js
index 7153d3905e0a23150041a7c73107c7a4f0621e93..019e7780aa5665cbea0741cfaeb051cbe7649964 100644
--- a/chrome/browser/resources/chromeos/login/header_bar.js
+++ b/chrome/browser/resources/chromeos/login/header_bar.js
@@ -46,8 +46,12 @@ cr.define('login', function() {
$('cancel-multiple-sign-in-button').addEventListener('click',
this.handleCancelMultipleSignInClick_);
if (Oobe.getInstance().displayType == DISPLAY_TYPE.LOGIN ||
- Oobe.getInstance().displayType == DISPLAY_TYPE.OOBE)
- login.AppsMenuButton.decorate($('show-apps-button'));
+ Oobe.getInstance().displayType == DISPLAY_TYPE.OOBE) {
+ if (Oobe.getInstance().newKioskUI)
+ chrome.send('initializeKioskApps');
+ else
+ login.AppsMenuButton.decorate($('show-apps-button'));
+ }
this.updateUI_();
},
@@ -230,8 +234,10 @@ cr.define('login', function() {
(!gaiaIsActive && !accountPickerIsActive);
$('cancel-multiple-sign-in-item').hidden = !isMultiProfilesUI;
- if (!$('apps-header-bar-item').hidden)
- $('show-apps-button').didShow();
+ if (!Oobe.getInstance().newKioskUI) {
+ if (!$('apps-header-bar-item').hidden)
+ $('show-apps-button').didShow();
+ }
},
/**

Powered by Google App Engine
This is Rietveld 408576698