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

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

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.html
diff --git a/chrome/browser/resources/extensions/extensions.html b/chrome/browser/resources/extensions/extensions.html
index da725ebf1f373ff928a670f329a642695a257a10..931bb7b8bfd90a00f3ecba1d237df4e3ba048fb0 100644
--- a/chrome/browser/resources/extensions/extensions.html
+++ b/chrome/browser/resources/extensions/extensions.html
@@ -21,6 +21,19 @@
<script src="chrome://resources/js/cr/ui/focus_manager.js"></script>
<script src="chrome://resources/js/cr/ui/overlay.js"></script>
+<if expr="pp_ifdef('chromeos')">
+<link rel="stylesheet" href="chrome://resources/css/list.css">
+<link rel="stylesheet" href="chromeos/kiosk_apps.css">
+<script src="chrome://resources/js/cr/event_target.js"></script>
+<script src="chrome://resources/js/cr/ui/array_data_model.js"></script>
+<script src="chrome://resources/js/cr/ui/list_selection_model.js"></script>
+<script src="chrome://resources/js/cr/ui/list_selection_controller.js"></script>
+<script src="chrome://resources/js/cr/ui/list_single_selection_model.js">
+</script>
+<script src="chrome://resources/js/cr/ui/list_item.js"></script>
+<script src="chrome://resources/js/cr/ui/list.js"></script>
+</if>
+
<script src="chrome://extensions-frame/extensions.js"></script>
</head>
@@ -31,6 +44,10 @@
<include src="extension_commands_overlay.html">
<include src="pack_extension_overlay.html">
<include src="../../../../ui/webui/resources/html/alert_overlay.html">
+<if expr="pp_ifdef('chromeos')">
+ <include src="chromeos/kiosk_apps.html">
+ <include src="chromeos/kiosk_app_disable_bailout_confirm.html">
+</if>
<div id="dropTargetOverlay" class="page">
<div i18n-content="extensionSettingsInstallDropTarget"></div>
</div>
@@ -58,6 +75,10 @@
i18n-content="extensionSettingsLoadUnpackedButton"></button>
<button id="pack-extension"
i18n-content="extensionSettingsPackButton"></button>
+<if expr="pp_ifdef('chromeos')">
+ <button id="add-kiosk-app"
+ i18n-content="addKioskAppButton" hidden></button>
+</if>
<div id="dev-controls-spacer"></div>
<button id="update-extensions-now"
i18n-content="extensionSettingsUpdateButton"></button>
« no previous file with comments | « chrome/browser/resources/extensions/chromeos/kiosk_apps.js ('k') | chrome/browser/resources/extensions/extensions.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698