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

Unified Diff: chrome/browser/resources/extensions/extensions.js

Issue 15966004: cros: Move kiosk settings to extensions page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix space Created 7 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
Index: chrome/browser/resources/extensions/extensions.js
diff --git a/chrome/browser/resources/extensions/extensions.js b/chrome/browser/resources/extensions/extensions.js
index 0fcc9194f10dd753ce83c65876f0d2169ac97d83..6e22d8bf82aaab6c4350304885ad0b9ff03db40f 100644
--- a/chrome/browser/resources/extensions/extensions.js
+++ b/chrome/browser/resources/extensions/extensions.js
@@ -8,6 +8,10 @@
<include src="extension_list.js"></include>
<include src="pack_extension_overlay.js"></include>
+<if expr="pp_ifdef('chromeos')">
+<include src="chromeos/kiosk_apps.js"></include>
+</if>
+
// Used for observing function of the backend datasource for this page by
// tests.
var webuiResponded = false;
@@ -113,6 +117,20 @@ cr.define('extensions', function() {
extensions.ExtensionCommandsOverlay.getInstance();
extensionCommandsOverlay.initializePage();
+ // Initialize the kiosk overlay.
+ if (cr.isChromeOS && loadTimeData.getBoolean('enableKiosk')) {
+ var kioskOverlay = extensions.KioskAppsOverlay.getInstance();
+ kioskOverlay.initialize();
+
+ $('add-kiosk-app').hidden = false;
+ $('add-kiosk-app').addEventListener('click', function() {
+ ExtensionSettings.showOverlay($('kiosk-apps-page'));
+ kioskOverlay.didShowPage();
+ });
+
+ extensions.KioskDisableBailoutConfirm.getInstance().initialize();
+ }
+
cr.ui.overlay.setupOverlay($('dropTargetOverlay'));
extensions.ExtensionFocusManager.getInstance().initialize();
« no previous file with comments | « chrome/browser/resources/extensions/extensions.html ('k') | chrome/browser/resources/options/browser_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698