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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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, 6 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html i18n-values="dir:textdirection;" class="loading"> 2 <html i18n-values="dir:textdirection;" class="loading">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 5
6 <link rel="stylesheet" href="extension_commands_overlay.css"> 6 <link rel="stylesheet" href="extension_commands_overlay.css">
7 <link rel="stylesheet" href="extensions.css"> 7 <link rel="stylesheet" href="extensions.css">
8 <link rel="stylesheet" href="pack_extension_overlay.css"> 8 <link rel="stylesheet" href="pack_extension_overlay.css">
9 <link rel="stylesheet" href="chrome://resources/css/alert_overlay.css"> 9 <link rel="stylesheet" href="chrome://resources/css/alert_overlay.css">
10 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css"> 10 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
11 <link rel="stylesheet" href="chrome://resources/css/overlay.css"> 11 <link rel="stylesheet" href="chrome://resources/css/overlay.css">
12 <link rel="stylesheet" href="chrome://resources/css/trash.css"> 12 <link rel="stylesheet" href="chrome://resources/css/trash.css">
13 <link rel="stylesheet" href="../uber/uber_shared.css"> 13 <link rel="stylesheet" href="../uber/uber_shared.css">
14 14
15 <script src="chrome://resources/js/cr.js"></script> 15 <script src="chrome://resources/js/cr.js"></script>
16 <script src="chrome://resources/js/load_time_data.js"></script> 16 <script src="chrome://resources/js/load_time_data.js"></script>
17 <script src="chrome://resources/js/util.js"></script> 17 <script src="chrome://resources/js/util.js"></script>
18 <script src="chrome://resources/js/cr/ui.js"></script> 18 <script src="chrome://resources/js/cr/ui.js"></script>
19 <script src="chrome://resources/js/cr/ui/alert_overlay.js"></script> 19 <script src="chrome://resources/js/cr/ui/alert_overlay.js"></script>
20 <script src="chrome://resources/js/cr/ui/drag_wrapper.js"></script> 20 <script src="chrome://resources/js/cr/ui/drag_wrapper.js"></script>
21 <script src="chrome://resources/js/cr/ui/focus_manager.js"></script> 21 <script src="chrome://resources/js/cr/ui/focus_manager.js"></script>
22 <script src="chrome://resources/js/cr/ui/overlay.js"></script> 22 <script src="chrome://resources/js/cr/ui/overlay.js"></script>
23 23
24 <if expr="pp_ifdef('chromeos')">
25 <link rel="stylesheet" href="chrome://resources/css/list.css">
26 <link rel="stylesheet" href="chromeos/kiosk_apps.css">
27 <script src="chrome://resources/js/cr/event_target.js"></script>
28 <script src="chrome://resources/js/cr/ui/array_data_model.js"></script>
29 <script src="chrome://resources/js/cr/ui/list_selection_model.js"></script>
30 <script src="chrome://resources/js/cr/ui/list_selection_controller.js"></script>
31 <script src="chrome://resources/js/cr/ui/list_single_selection_model.js">
32 </script>
33 <script src="chrome://resources/js/cr/ui/list_item.js"></script>
34 <script src="chrome://resources/js/cr/ui/list.js"></script>
35 </if>
36
24 <script src="chrome://extensions-frame/extensions.js"></script> 37 <script src="chrome://extensions-frame/extensions.js"></script>
25 </head> 38 </head>
26 39
27 <body class="uber-frame" 40 <body class="uber-frame"
28 i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> 41 i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
29 42
30 <div id="overlay" class="overlay" hidden> 43 <div id="overlay" class="overlay" hidden>
31 <include src="extension_commands_overlay.html"> 44 <include src="extension_commands_overlay.html">
32 <include src="pack_extension_overlay.html"> 45 <include src="pack_extension_overlay.html">
33 <include src="../../../../ui/webui/resources/html/alert_overlay.html"> 46 <include src="../../../../ui/webui/resources/html/alert_overlay.html">
47 <if expr="pp_ifdef('chromeos')">
48 <include src="chromeos/kiosk_apps.html">
49 <include src="chromeos/kiosk_app_disable_bailout_confirm.html">
50 </if>
34 <div id="dropTargetOverlay" class="page"> 51 <div id="dropTargetOverlay" class="page">
35 <div i18n-content="extensionSettingsInstallDropTarget"></div> 52 <div i18n-content="extensionSettingsInstallDropTarget"></div>
36 </div> 53 </div>
37 </div> 54 </div>
38 55
39 <div class="page" id="extension-settings"> 56 <div class="page" id="extension-settings">
40 <header id="page-header"><h1 i18n-content="extensionSettings"></h1> 57 <header id="page-header"><h1 i18n-content="extensionSettings"></h1>
41 <div id="header-controls" class="header-extras"> 58 <div id="header-controls" class="header-extras">
42 <div id="dev-toggle" class="checkbox"> 59 <div id="dev-toggle" class="checkbox">
43 <label> 60 <label>
44 <input id="toggle-dev-on" type="checkbox"> 61 <input id="toggle-dev-on" type="checkbox">
45 <span i18n-content="extensionSettingsDeveloperMode"> 62 <span i18n-content="extensionSettingsDeveloperMode">
46 </label> 63 </label>
47 </div> 64 </div>
48 </div> 65 </div>
49 <div class="page-banner profile-is-managed-banner"> 66 <div class="page-banner profile-is-managed-banner">
50 <div class="page-banner-gradient"> 67 <div class="page-banner-gradient">
51 <span class="page-banner-text" 68 <span class="page-banner-text"
52 i18n-content="extensionSettingsManagedMode"></span> 69 i18n-content="extensionSettingsManagedMode"></span>
53 </div> 70 </div>
54 </div> 71 </div>
55 </header> 72 </header>
56 <div id="dev-controls" hidden> 73 <div id="dev-controls" hidden>
57 <button id="load-unpacked" 74 <button id="load-unpacked"
58 i18n-content="extensionSettingsLoadUnpackedButton"></button> 75 i18n-content="extensionSettingsLoadUnpackedButton"></button>
59 <button id="pack-extension" 76 <button id="pack-extension"
60 i18n-content="extensionSettingsPackButton"></button> 77 i18n-content="extensionSettingsPackButton"></button>
78 <if expr="pp_ifdef('chromeos')">
79 <button id="add-kiosk-app"
80 i18n-content="addKioskAppButton" hidden></button>
81 </if>
61 <div id="dev-controls-spacer"></div> 82 <div id="dev-controls-spacer"></div>
62 <button id="update-extensions-now" 83 <button id="update-extensions-now"
63 i18n-content="extensionSettingsUpdateButton"></button> 84 i18n-content="extensionSettingsUpdateButton"></button>
64 </div> 85 </div>
65 <div id="extension-settings-list" class="empty-extension-list"></div> 86 <div id="extension-settings-list" class="empty-extension-list"></div>
66 <div id="no-extensions"> 87 <div id="no-extensions">
67 <span id="no-extensions-message" 88 <span id="no-extensions-message"
68 i18n-content="extensionSettingsNoExtensions"></span> 89 i18n-content="extensionSettingsNoExtensions"></span>
69 <span id="suggest-gallery" class="more-extensions-link" 90 <span id="suggest-gallery" class="more-extensions-link"
70 i18n-values=".innerHTML:extensionSettingsSuggestGallery"> 91 i18n-values=".innerHTML:extensionSettingsSuggestGallery">
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 194
174 <include src="../../../../ui/webui/resources/html/trash.html"> 195 <include src="../../../../ui/webui/resources/html/trash.html">
175 196
176 </div> 197 </div>
177 198
178 <script src="chrome://extensions-frame/strings.js"></script> 199 <script src="chrome://extensions-frame/strings.js"></script>
179 <script src="chrome://resources/js/i18n_template2.js"></script> 200 <script src="chrome://resources/js/i18n_template2.js"></script>
180 201
181 </body> 202 </body>
182 </html> 203 </html>
OLDNEW
« 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