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

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

Issue 15966004: cros: Move kiosk settings to extensions page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and remove temp flag 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/chromeos/kiosk_apps.html
diff --git a/chrome/browser/resources/options/chromeos/kiosk_apps.html b/chrome/browser/resources/extensions/chromeos/kiosk_apps.html
similarity index 91%
rename from chrome/browser/resources/options/chromeos/kiosk_apps.html
rename to chrome/browser/resources/extensions/chromeos/kiosk_apps.html
index 05e59ca61c12e82abb311fc40a02ed4dab6dc6b7..6b1fa1a0771289f541ddf788ab8756aaa5a6e36b 100644
--- a/chrome/browser/resources/options/chromeos/kiosk_apps.html
+++ b/chrome/browser/resources/extensions/chromeos/kiosk_apps.html
@@ -1,4 +1,4 @@
-<div id="kiosk-apps-page" class="page" hidden>
+<div id="kiosk-apps-page" class="page">
<div class="close-button"></div>
<h1 i18n-content="kioskOverlayTitle"></h1>
<div class="content-area">
@@ -15,9 +15,7 @@
</label>
<div class="checkbox">
<span class="controlled-setting-with-label">
- <input id="kiosk-disable-bailout-shortcut" type="checkbox"
- pref="cros.accounts.deviceLocalAccountAutoLoginBailoutEnabled"
- inverted_pref>
+ <input id="kiosk-disable-bailout-shortcut" type="checkbox">
<span>
<label for="kiosk-disable-bailout-shortcut"
i18n-content="kioskDiableBailoutShortcutLabel">

Powered by Google App Engine
This is Rietveld 408576698