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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options/options.html

Issue 449623003: Integrate About page into Settings for Chrome OS settings in a window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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/browser_options.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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 <link rel="stylesheet" href="chromeos/accounts_options_page.css"> 56 <link rel="stylesheet" href="chromeos/accounts_options_page.css">
57 <link rel="stylesheet" href="chromeos/bluetooth.css"> 57 <link rel="stylesheet" href="chromeos/bluetooth.css">
58 <link rel="stylesheet" href="chromeos/change_picture_options.css"> 58 <link rel="stylesheet" href="chromeos/change_picture_options.css">
59 <link rel="stylesheet" href="chromeos/consumer_management_overlay.css"> 59 <link rel="stylesheet" href="chromeos/consumer_management_overlay.css">
60 <link rel="stylesheet" href="chromeos/display_options.css"> 60 <link rel="stylesheet" href="chromeos/display_options.css">
61 <link rel="stylesheet" href="chromeos/display_overscan.css"> 61 <link rel="stylesheet" href="chromeos/display_overscan.css">
62 <link rel="stylesheet" href="chromeos/internet_detail.css"> 62 <link rel="stylesheet" href="chromeos/internet_detail.css">
63 <link rel="stylesheet" href="chromeos/keyboard_overlay.css"> 63 <link rel="stylesheet" href="chromeos/keyboard_overlay.css">
64 <link rel="stylesheet" href="chromeos/pointer_overlay.css"> 64 <link rel="stylesheet" href="chromeos/pointer_overlay.css">
65 <link rel="stylesheet" href="factory_reset_overlay.css"> 65 <link rel="stylesheet" href="factory_reset_overlay.css">
66 <link rel="stylesheet" href="../help/help_content.css">
67 <link rel="stylesheet" href="../help/channel_change_page.css">
66 </if> 68 </if>
67 <if expr="use_nss"> 69 <if expr="use_nss">
68 <link rel="stylesheet" href="certificate_manager.css"> 70 <link rel="stylesheet" href="certificate_manager.css">
69 <link rel="stylesheet" href="certificate_tree.css"> 71 <link rel="stylesheet" href="certificate_tree.css">
70 </if> 72 </if>
71 <if expr="enable_settings_app"> 73 <if expr="enable_settings_app">
72 <link rel="stylesheet" href="options_settings_app.css"> 74 <link rel="stylesheet" href="options_settings_app.css">
73 </if> 75 </if>
74 <script src="chrome://resources/css/tree.css.js"></script> 76 <script src="chrome://resources/css/tree.css.js"></script>
75 <script src="chrome://resources/js/cr.js"></script> 77 <script src="chrome://resources/js/cr.js"></script>
(...skipping 23 matching lines...) Expand all
99 <script src="chrome://resources/js/cr/ui/page_manager/page_manager.js"></script> 101 <script src="chrome://resources/js/cr/ui/page_manager/page_manager.js"></script>
100 <script src="chrome://resources/js/cr/ui/page_manager/page.js"></script> 102 <script src="chrome://resources/js/cr/ui/page_manager/page.js"></script>
101 <script src="chrome://resources/js/load_time_data.js"></script> 103 <script src="chrome://resources/js/load_time_data.js"></script>
102 <script src="chrome://resources/js/parse_html_subset.js"></script> 104 <script src="chrome://resources/js/parse_html_subset.js"></script>
103 <script src="chrome://resources/js/util.js"></script> 105 <script src="chrome://resources/js/util.js"></script>
104 106
105 <script src="chrome://settings-frame/strings.js"></script> 107 <script src="chrome://settings-frame/strings.js"></script>
106 <script src="chrome://settings-frame/options_bundle.js"></script> 108 <script src="chrome://settings-frame/options_bundle.js"></script>
107 </head> 109 </head>
108 110
109 <body class="uber-frame" 111 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
110 i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
111 <div id="overlay-container-1" class="overlay transparent" hidden> 112 <div id="overlay-container-1" class="overlay transparent" hidden>
112 <include src="autofill_options.html"> 113 <include src="autofill_options.html">
113 <include src="clear_browser_data_overlay.html"> 114 <include src="clear_browser_data_overlay.html">
114 <include src="content_settings.html"> 115 <include src="content_settings.html">
115 <include src="do_not_track_confirm_overlay.html"> 116 <include src="do_not_track_confirm_overlay.html">
116 <include src="easy_unlock_turn_off_overlay.html"> 117 <include src="easy_unlock_turn_off_overlay.html">
117 <include src="font_settings.html"> 118 <include src="font_settings.html">
118 <include src="home_page_overlay.html"> 119 <include src="home_page_overlay.html">
119 <include src="hotword_confirm_overlay.html"> 120 <include src="hotword_confirm_overlay.html">
120 <include src="import_data_overlay.html"> 121 <include src="import_data_overlay.html">
(...skipping 10 matching lines...) Expand all
131 <if expr="chromeos"> 132 <if expr="chromeos">
132 <include src="chromeos/accounts_options.html"> 133 <include src="chromeos/accounts_options.html">
133 <include src="chromeos/bluetooth_add_device_overlay.html"> 134 <include src="chromeos/bluetooth_add_device_overlay.html">
134 <include src="chromeos/bluetooth_pair_device_overlay.html"> 135 <include src="chromeos/bluetooth_pair_device_overlay.html">
135 <include src="chromeos/change_picture_options.html"> 136 <include src="chromeos/change_picture_options.html">
136 <include src="chromeos/consumer_management_overlay.html"> 137 <include src="chromeos/consumer_management_overlay.html">
137 <include src="chromeos/display_options.html"> 138 <include src="chromeos/display_options.html">
138 <include src="chromeos/keyboard_overlay.html"> 139 <include src="chromeos/keyboard_overlay.html">
139 <include src="chromeos/pointer_overlay.html"> 140 <include src="chromeos/pointer_overlay.html">
140 <include src="factory_reset_overlay.html"> 141 <include src="factory_reset_overlay.html">
142 <include src="../help/help_page.html">
141 </if> 143 </if>
142 <if expr="use_nss"> 144 <if expr="use_nss">
143 <include src="certificate_manager.html"> 145 <include src="certificate_manager.html">
144 </if> 146 </if>
145 </div> 147 </div>
146 <div id="overlay-container-2" class="overlay transparent" hidden> 148 <div id="overlay-container-2" class="overlay transparent" hidden>
147 <include src="alert_overlay.html"> 149 <include src="alert_overlay.html">
148 <include src="autofill_edit_address_overlay.html"> 150 <include src="autofill_edit_address_overlay.html">
149 <include src="autofill_edit_creditcard_overlay.html"> 151 <include src="autofill_edit_creditcard_overlay.html">
150 <include src="content_settings_exceptions_area.html"> 152 <include src="content_settings_exceptions_area.html">
151 <include src="cookies_view.html"> 153 <include src="cookies_view.html">
152 <include src="handler_options.html"> 154 <include src="handler_options.html">
153 <include src="language_add_language_overlay.html"> 155 <include src="language_add_language_overlay.html">
154 <include src="supervised_user_import.html"> 156 <include src="supervised_user_import.html">
155 <include src="supervised_user_learn_more.html"> 157 <include src="supervised_user_learn_more.html">
156 <if expr="not is_macosx"> 158 <if expr="not is_macosx">
157 <include src="language_dictionary_overlay.html"> 159 <include src="language_dictionary_overlay.html">
158 </if> 160 </if>
159 <if expr="chromeos"> 161 <if expr="chromeos">
160 <include src="chromeos/display_overscan.html"> 162 <include src="chromeos/display_overscan.html">
161 <include src="chromeos/internet_detail.html"> 163 <include src="chromeos/internet_detail.html">
162 <include src="chromeos/preferred_networks.html"> 164 <include src="chromeos/preferred_networks.html">
163 <include src="chromeos/third_party_ime_confirm_overlay.html"> 165 <include src="chromeos/third_party_ime_confirm_overlay.html">
166 <include src="../help/channel_change_page.html">
164 </if> 167 </if>
165 <if expr="not is_win and not is_macosx"> 168 <if expr="not is_win and not is_macosx">
166 <include src="certificate_restore_overlay.html"> 169 <include src="certificate_restore_overlay.html">
167 <include src="certificate_backup_overlay.html"> 170 <include src="certificate_backup_overlay.html">
168 <include src="certificate_edit_ca_trust_overlay.html"> 171 <include src="certificate_edit_ca_trust_overlay.html">
169 <include src="certificate_import_error_overlay.html"> 172 <include src="certificate_import_error_overlay.html">
170 </if> 173 </if>
171 </div> 174 </div>
172 <div id="overlay-container-3" class="overlay transparent" hidden>
173 </div>
174 <div id="extension-controlled-settings-bubble-template" hidden> 175 <div id="extension-controlled-settings-bubble-template" hidden>
175 <div class="controlled-setting-bubble-content-row"> 176 <div class="controlled-setting-bubble-content-row">
176 <div class="controlled-setting-bubble-extension-name"></div> 177 <div class="controlled-setting-bubble-extension-name"></div>
177 </div> 178 </div>
178 <div class="controlled-setting-bubble-content-row"> 179 <div class="controlled-setting-bubble-content-row">
179 <button class="controlled-setting-bubble-extension-manage-link link-button" 180 <button class="controlled-setting-bubble-extension-manage-link link-button"
180 i18n-content="controlledSettingManageExtension"></button> 181 i18n-content="controlledSettingManageExtension"></button>
181 <button class='controlled-setting-bubble-extension-disable-button' 182 <button class='controlled-setting-bubble-extension-disable-button'
182 i18n-content="controlledSettingDisableExtension"></button> 183 i18n-content="controlledSettingDisableExtension"></button>
183 </div> 184 </div>
(...skipping 15 matching lines...) Expand all
199 <include src="search_page.html"> 200 <include src="search_page.html">
200 <include src="browser_options.html"> 201 <include src="browser_options.html">
201 </div> 202 </div>
202 </div> 203 </div>
203 </div> 204 </div>
204 </div> 205 </div>
205 206
206 <script src="chrome://resources/js/i18n_template2.js"></script> 207 <script src="chrome://resources/js/i18n_template2.js"></script>
207 </body> 208 </body>
208 </html> 209 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/browser_options.js ('k') | chrome/browser/resources/options/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698