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

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: About in Settings 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
« chrome/browser/resources/options/browser_options.css ('K') | « chrome/browser/resources/options/browser_options.js ('k') | chrome/browser/resources/options/options.js » ('j') | chrome/browser/ui/webui/options/help_overlay_handler.cc » ('J')
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 <link rel="stylesheet" href="chromeos/accounts_options_page.css"> 55 <link rel="stylesheet" href="chromeos/accounts_options_page.css">
56 <link rel="stylesheet" href="chromeos/bluetooth.css"> 56 <link rel="stylesheet" href="chromeos/bluetooth.css">
57 <link rel="stylesheet" href="chromeos/change_picture_options.css"> 57 <link rel="stylesheet" href="chromeos/change_picture_options.css">
58 <link rel="stylesheet" href="chromeos/consumer_management_overlay.css"> 58 <link rel="stylesheet" href="chromeos/consumer_management_overlay.css">
59 <link rel="stylesheet" href="chromeos/display_options.css"> 59 <link rel="stylesheet" href="chromeos/display_options.css">
60 <link rel="stylesheet" href="chromeos/display_overscan.css"> 60 <link rel="stylesheet" href="chromeos/display_overscan.css">
61 <link rel="stylesheet" href="chromeos/internet_detail.css"> 61 <link rel="stylesheet" href="chromeos/internet_detail.css">
62 <link rel="stylesheet" href="chromeos/keyboard_overlay.css"> 62 <link rel="stylesheet" href="chromeos/keyboard_overlay.css">
63 <link rel="stylesheet" href="chromeos/pointer_overlay.css"> 63 <link rel="stylesheet" href="chromeos/pointer_overlay.css">
64 <link rel="stylesheet" href="factory_reset_overlay.css"> 64 <link rel="stylesheet" href="factory_reset_overlay.css">
65 <link rel="stylesheet" href="../help/help_content.css">
66 <link rel="stylesheet" href="../help/channel_change_page.css">
65 </if> 67 </if>
66 <if expr="use_nss"> 68 <if expr="use_nss">
67 <link rel="stylesheet" href="certificate_manager.css"> 69 <link rel="stylesheet" href="certificate_manager.css">
68 <link rel="stylesheet" href="certificate_tree.css"> 70 <link rel="stylesheet" href="certificate_tree.css">
69 </if> 71 </if>
70 <if expr="enable_settings_app"> 72 <if expr="enable_settings_app">
71 <link rel="stylesheet" href="options_settings_app.css"> 73 <link rel="stylesheet" href="options_settings_app.css">
72 </if> 74 </if>
73 <script src="chrome://resources/css/tree.css.js"></script> 75 <script src="chrome://resources/css/tree.css.js"></script>
74 <script src="chrome://resources/js/cr.js"></script> 76 <script src="chrome://resources/js/cr.js"></script>
(...skipping 23 matching lines...) Expand all
98 <script src="chrome://resources/js/cr/ui/page_manager/page_manager.js"></script> 100 <script src="chrome://resources/js/cr/ui/page_manager/page_manager.js"></script>
99 <script src="chrome://resources/js/cr/ui/page_manager/page.js"></script> 101 <script src="chrome://resources/js/cr/ui/page_manager/page.js"></script>
100 <script src="chrome://resources/js/load_time_data.js"></script> 102 <script src="chrome://resources/js/load_time_data.js"></script>
101 <script src="chrome://resources/js/parse_html_subset.js"></script> 103 <script src="chrome://resources/js/parse_html_subset.js"></script>
102 <script src="chrome://resources/js/util.js"></script> 104 <script src="chrome://resources/js/util.js"></script>
103 105
104 <script src="chrome://settings-frame/strings.js"></script> 106 <script src="chrome://settings-frame/strings.js"></script>
105 <script src="chrome://settings-frame/options_bundle.js"></script> 107 <script src="chrome://settings-frame/options_bundle.js"></script>
106 </head> 108 </head>
107 109
108 <body class="uber-frame" 110 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
109 i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
110 <div id="overlay-container-1" class="overlay transparent" hidden> 111 <div id="overlay-container-1" class="overlay transparent" hidden>
111 <include src="autofill_options.html"> 112 <include src="autofill_options.html">
112 <include src="clear_browser_data_overlay.html"> 113 <include src="clear_browser_data_overlay.html">
113 <include src="content_settings.html"> 114 <include src="content_settings.html">
114 <include src="do_not_track_confirm_overlay.html"> 115 <include src="do_not_track_confirm_overlay.html">
115 <include src="font_settings.html"> 116 <include src="font_settings.html">
116 <include src="home_page_overlay.html"> 117 <include src="home_page_overlay.html">
117 <include src="hotword_confirm_overlay.html"> 118 <include src="hotword_confirm_overlay.html">
118 <include src="import_data_overlay.html"> 119 <include src="import_data_overlay.html">
119 <include src="language_options.html"> 120 <include src="language_options.html">
120 <include src="manage_profile_overlay.html"> 121 <include src="manage_profile_overlay.html">
121 <include src="password_manager.html"> 122 <include src="password_manager.html">
122 <include src="reset_profile_settings_overlay.html"> 123 <include src="reset_profile_settings_overlay.html">
123 <include src="search_engine_manager.html"> 124 <include src="search_engine_manager.html">
124 <include src="spelling_confirm_overlay.html"> 125 <include src="spelling_confirm_overlay.html">
125 <include src="startup_overlay.html"> 126 <include src="startup_overlay.html">
126 <include src="supervised_user_create_confirm.html"> 127 <include src="supervised_user_create_confirm.html">
127 <include src="website_settings.html"> 128 <include src="website_settings.html">
128 <include src="../sync_setup_overlay.html"> 129 <include src="../sync_setup_overlay.html">
129 <if expr="chromeos"> 130 <if expr="chromeos">
130 <include src="chromeos/accounts_options.html"> 131 <include src="chromeos/accounts_options.html">
131 <include src="chromeos/bluetooth_add_device_overlay.html"> 132 <include src="chromeos/bluetooth_add_device_overlay.html">
132 <include src="chromeos/bluetooth_pair_device_overlay.html"> 133 <include src="chromeos/bluetooth_pair_device_overlay.html">
133 <include src="chromeos/change_picture_options.html"> 134 <include src="chromeos/change_picture_options.html">
134 <include src="chromeos/consumer_management_overlay.html"> 135 <include src="chromeos/consumer_management_overlay.html">
135 <include src="chromeos/display_options.html"> 136 <include src="chromeos/display_options.html">
136 <include src="chromeos/keyboard_overlay.html"> 137 <include src="chromeos/keyboard_overlay.html">
137 <include src="chromeos/pointer_overlay.html"> 138 <include src="chromeos/pointer_overlay.html">
138 <include src="factory_reset_overlay.html"> 139 <include src="factory_reset_overlay.html">
140 <include src="../help/help_page.html">
139 </if> 141 </if>
140 <if expr="use_nss"> 142 <if expr="use_nss">
141 <include src="certificate_manager.html"> 143 <include src="certificate_manager.html">
142 </if> 144 </if>
143 </div> 145 </div>
144 <div id="overlay-container-2" class="overlay transparent" hidden> 146 <div id="overlay-container-2" class="overlay transparent" hidden>
145 <include src="alert_overlay.html"> 147 <include src="alert_overlay.html">
146 <include src="autofill_edit_address_overlay.html"> 148 <include src="autofill_edit_address_overlay.html">
147 <include src="autofill_edit_creditcard_overlay.html"> 149 <include src="autofill_edit_creditcard_overlay.html">
148 <include src="content_settings_exceptions_area.html"> 150 <include src="content_settings_exceptions_area.html">
149 <include src="cookies_view.html"> 151 <include src="cookies_view.html">
150 <include src="handler_options.html"> 152 <include src="handler_options.html">
151 <include src="language_add_language_overlay.html"> 153 <include src="language_add_language_overlay.html">
152 <include src="supervised_user_import.html"> 154 <include src="supervised_user_import.html">
153 <include src="supervised_user_learn_more.html"> 155 <include src="supervised_user_learn_more.html">
154 <if expr="not is_macosx"> 156 <if expr="not is_macosx">
155 <include src="language_dictionary_overlay.html"> 157 <include src="language_dictionary_overlay.html">
156 </if> 158 </if>
157 <if expr="chromeos"> 159 <if expr="chromeos">
158 <include src="chromeos/display_overscan.html"> 160 <include src="chromeos/display_overscan.html">
159 <include src="chromeos/internet_detail.html"> 161 <include src="chromeos/internet_detail.html">
160 <include src="chromeos/preferred_networks.html"> 162 <include src="chromeos/preferred_networks.html">
161 <include src="chromeos/third_party_ime_confirm_overlay.html"> 163 <include src="chromeos/third_party_ime_confirm_overlay.html">
164 <include src="../help/channel_change_page.html">
162 </if> 165 </if>
163 <if expr="not is_win and not is_macosx"> 166 <if expr="not is_win and not is_macosx">
164 <include src="certificate_restore_overlay.html"> 167 <include src="certificate_restore_overlay.html">
165 <include src="certificate_backup_overlay.html"> 168 <include src="certificate_backup_overlay.html">
166 <include src="certificate_edit_ca_trust_overlay.html"> 169 <include src="certificate_edit_ca_trust_overlay.html">
167 <include src="certificate_import_error_overlay.html"> 170 <include src="certificate_import_error_overlay.html">
168 </if> 171 </if>
169 </div> 172 </div>
170 <div id="overlay-container-3" class="overlay transparent" hidden>
171 </div>
172 <div id="extension-controlled-settings-bubble-template" hidden> 173 <div id="extension-controlled-settings-bubble-template" hidden>
173 <div class="controlled-setting-bubble-content-row"> 174 <div class="controlled-setting-bubble-content-row">
174 <div class="controlled-setting-bubble-extension-name"></div> 175 <div class="controlled-setting-bubble-extension-name"></div>
175 </div> 176 </div>
176 <div class="controlled-setting-bubble-content-row"> 177 <div class="controlled-setting-bubble-content-row">
177 <button class="controlled-setting-bubble-extension-manage-link link-button" 178 <button class="controlled-setting-bubble-extension-manage-link link-button"
178 i18n-content="controlledSettingManageExtension"></button> 179 i18n-content="controlledSettingManageExtension"></button>
179 <button class='controlled-setting-bubble-extension-disable-button' 180 <button class='controlled-setting-bubble-extension-disable-button'
180 i18n-content="controlledSettingDisableExtension"></button> 181 i18n-content="controlledSettingDisableExtension"></button>
181 </div> 182 </div>
(...skipping 15 matching lines...) Expand all
197 <include src="search_page.html"> 198 <include src="search_page.html">
198 <include src="browser_options.html"> 199 <include src="browser_options.html">
199 </div> 200 </div>
200 </div> 201 </div>
201 </div> 202 </div>
202 </div> 203 </div>
203 204
204 <script src="chrome://resources/js/i18n_template2.js"></script> 205 <script src="chrome://resources/js/i18n_template2.js"></script>
205 </body> 206 </body>
206 </html> 207 </html>
OLDNEW
« chrome/browser/resources/options/browser_options.css ('K') | « chrome/browser/resources/options/browser_options.js ('k') | chrome/browser/resources/options/options.js » ('j') | chrome/browser/ui/webui/options/help_overlay_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698