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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options/options.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/options/chromeos/kiosk_apps.js ('k') | chrome/browser/resources/options/options.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 id="t" i18n-values="dir:textdirection"> 2 <html id="t" i18n-values="dir:textdirection">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <title i18n-content="optionsPageTitle"></title> 5 <title i18n-content="optionsPageTitle"></title>
6 <link rel="stylesheet" href="chrome://resources/css/bubble.css"> 6 <link rel="stylesheet" href="chrome://resources/css/bubble.css">
7 <link rel="stylesheet" href="chrome://resources/css/bubble_button.css"> 7 <link rel="stylesheet" href="chrome://resources/css/bubble_button.css">
8 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css"> 8 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
9 <link rel="stylesheet" href="chrome://resources/css/list.css"> 9 <link rel="stylesheet" href="chrome://resources/css/list.css">
10 <link rel="stylesheet" href="chrome://resources/css/overlay.css"> 10 <link rel="stylesheet" href="chrome://resources/css/overlay.css">
(...skipping 29 matching lines...) Expand all
40 <link rel="stylesheet" href="subpages_tab_controls.css"> 40 <link rel="stylesheet" href="subpages_tab_controls.css">
41 <link rel="stylesheet" href="startup_overlay.css"> 41 <link rel="stylesheet" href="startup_overlay.css">
42 <link rel="stylesheet" href="../sync_setup_overlay.css"> 42 <link rel="stylesheet" href="../sync_setup_overlay.css">
43 <if expr="pp_ifdef('chromeos')"> 43 <if expr="pp_ifdef('chromeos')">
44 <link rel="stylesheet" href="chromeos/accounts_options_page.css"> 44 <link rel="stylesheet" href="chromeos/accounts_options_page.css">
45 <link rel="stylesheet" href="chromeos/bluetooth.css"> 45 <link rel="stylesheet" href="chromeos/bluetooth.css">
46 <link rel="stylesheet" href="chromeos/change_picture_options.css"> 46 <link rel="stylesheet" href="chromeos/change_picture_options.css">
47 <link rel="stylesheet" href="chromeos/display_options.css"> 47 <link rel="stylesheet" href="chromeos/display_options.css">
48 <link rel="stylesheet" href="chromeos/display_overscan.css"> 48 <link rel="stylesheet" href="chromeos/display_overscan.css">
49 <link rel="stylesheet" href="chromeos/internet_detail.css"> 49 <link rel="stylesheet" href="chromeos/internet_detail.css">
50 <link rel="stylesheet" href="chromeos/kiosk_apps.css">
51 <link rel="stylesheet" href="chromeos/pointer_overlay.css"> 50 <link rel="stylesheet" href="chromeos/pointer_overlay.css">
52 <link rel="stylesheet" href="factory_reset_overlay.css"> 51 <link rel="stylesheet" href="factory_reset_overlay.css">
53 </if> 52 </if>
54 <if expr="pp_ifdef('use_nss')"> 53 <if expr="pp_ifdef('use_nss')">
55 <link rel="stylesheet" href="certificate_manager.css"> 54 <link rel="stylesheet" href="certificate_manager.css">
56 <link rel="stylesheet" href="certificate_tree.css"> 55 <link rel="stylesheet" href="certificate_tree.css">
57 </if> 56 </if>
58 <if expr="pp_ifdef('enable_settings_app')"> 57 <if expr="pp_ifdef('enable_settings_app')">
59 <link rel="stylesheet" href="options_settings_app.css"> 58 <link rel="stylesheet" href="options_settings_app.css">
60 </if> 59 </if>
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 <include src="spelling_confirm_overlay.html"> 107 <include src="spelling_confirm_overlay.html">
109 <include src="startup_overlay.html"> 108 <include src="startup_overlay.html">
110 <include src="../sync_setup_overlay.html"> 109 <include src="../sync_setup_overlay.html">
111 <if expr="pp_ifdef('chromeos')"> 110 <if expr="pp_ifdef('chromeos')">
112 <include src="chromeos/accounts_options.html"> 111 <include src="chromeos/accounts_options.html">
113 <include src="chromeos/bluetooth_add_device_overlay.html"> 112 <include src="chromeos/bluetooth_add_device_overlay.html">
114 <include src="chromeos/bluetooth_pair_device_overlay.html"> 113 <include src="chromeos/bluetooth_pair_device_overlay.html">
115 <include src="chromeos/change_picture_options.html"> 114 <include src="chromeos/change_picture_options.html">
116 <include src="chromeos/display_options.html"> 115 <include src="chromeos/display_options.html">
117 <include src="chromeos/keyboard_overlay.html"> 116 <include src="chromeos/keyboard_overlay.html">
118 <include src="chromeos/kiosk_apps.html">
119 <include src="chromeos/pointer_overlay.html"> 117 <include src="chromeos/pointer_overlay.html">
120 <include src="factory_reset_overlay.html"> 118 <include src="factory_reset_overlay.html">
121 </if> 119 </if>
122 <if expr="pp_ifdef('use_nss')"> 120 <if expr="pp_ifdef('use_nss')">
123 <include src="certificate_manager.html"> 121 <include src="certificate_manager.html">
124 </if> 122 </if>
125 </div> 123 </div>
126 <div id="overlay-container-2" class="overlay transparent" hidden> 124 <div id="overlay-container-2" class="overlay transparent" hidden>
127 <include src="alert_overlay.html"> 125 <include src="alert_overlay.html">
128 <include src="autofill_edit_address_overlay.html"> 126 <include src="autofill_edit_address_overlay.html">
129 <include src="autofill_edit_creditcard_overlay.html"> 127 <include src="autofill_edit_creditcard_overlay.html">
130 <include src="content_settings_exceptions_area.html"> 128 <include src="content_settings_exceptions_area.html">
131 <include src="cookies_view.html"> 129 <include src="cookies_view.html">
132 <include src="handler_options.html"> 130 <include src="handler_options.html">
133 <include src="language_add_language_overlay.html"> 131 <include src="language_add_language_overlay.html">
134 <include src="managed_user_learn_more.html"> 132 <include src="managed_user_learn_more.html">
135 <if expr="not is_macosx"> 133 <if expr="not is_macosx">
136 <include src="language_dictionary_overlay.html"> 134 <include src="language_dictionary_overlay.html">
137 </if> 135 </if>
138 <include src="media_galleries_manager_overlay.html"> 136 <include src="media_galleries_manager_overlay.html">
139 <if expr="pp_ifdef('chromeos')"> 137 <if expr="pp_ifdef('chromeos')">
140 <include src="chromeos/display_overscan.html"> 138 <include src="chromeos/display_overscan.html">
141 <include src="chromeos/internet_detail.html"> 139 <include src="chromeos/internet_detail.html">
142 <include src="chromeos/preferred_networks.html"> 140 <include src="chromeos/preferred_networks.html">
143 <include src="chromeos/language_chewing_options.html"> 141 <include src="chromeos/language_chewing_options.html">
144 <include src="chromeos/language_hangul_options.html"> 142 <include src="chromeos/language_hangul_options.html">
145 <include src="chromeos/language_mozc_options.html"> 143 <include src="chromeos/language_mozc_options.html">
146 <include src="chromeos/language_pinyin_options.html"> 144 <include src="chromeos/language_pinyin_options.html">
147 <include src="chromeos/kiosk_app_disable_bailout_confirm.html">
148 </if> 145 </if>
149 <if expr="not is_win and not is_macosx"> 146 <if expr="not is_win and not is_macosx">
150 <include src="certificate_restore_overlay.html"> 147 <include src="certificate_restore_overlay.html">
151 <include src="certificate_backup_overlay.html"> 148 <include src="certificate_backup_overlay.html">
152 <include src="certificate_edit_ca_trust_overlay.html"> 149 <include src="certificate_edit_ca_trust_overlay.html">
153 <include src="certificate_import_error_overlay.html"> 150 <include src="certificate_import_error_overlay.html">
154 </if> 151 </if>
155 </div> 152 </div>
156 <div id="overlay-container-3" class="overlay transparent" hidden> 153 <div id="overlay-container-3" class="overlay transparent" hidden>
157 </div> 154 </div>
158 155
159 <div id="main-content"> 156 <div id="main-content">
160 <div id="mainview"> 157 <div id="mainview">
161 <div id="mainview-content"> 158 <div id="mainview-content">
162 <div id="page-container"> 159 <div id="page-container">
163 <!-- Please keep the main pages in desired order of display. This will 160 <!-- Please keep the main pages in desired order of display. This will
164 allow search results to display in the desired order. --> 161 allow search results to display in the desired order. -->
165 <include src="search_box.html"> 162 <include src="search_box.html">
166 <include src="search_page.html"> 163 <include src="search_page.html">
167 <include src="browser_options.html"> 164 <include src="browser_options.html">
168 </div> 165 </div>
169 </div> 166 </div>
170 </div> 167 </div>
171 </div> 168 </div>
172 169
173 <script src="chrome://resources/js/i18n_template2.js"></script> 170 <script src="chrome://resources/js/i18n_template2.js"></script>
174 </body> 171 </body>
175 </html> 172 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/chromeos/kiosk_apps.js ('k') | chrome/browser/resources/options/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698