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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 566863005: Expose the Website Settings page in the Content Setting page if it is enabled via flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« chrome/browser/resources/options/content_settings.html ('K') | « chrome/browser/resources/options/content_settings.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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 <include src="hotword_confirm_overlay.html"> 120 <include src="hotword_confirm_overlay.html">
121 <include src="import_data_overlay.html"> 121 <include src="import_data_overlay.html">
122 <include src="language_options.html"> 122 <include src="language_options.html">
123 <include src="manage_profile_overlay.html"> 123 <include src="manage_profile_overlay.html">
124 <include src="password_manager.html"> 124 <include src="password_manager.html">
125 <include src="reset_profile_settings_overlay.html"> 125 <include src="reset_profile_settings_overlay.html">
126 <include src="search_engine_manager.html"> 126 <include src="search_engine_manager.html">
127 <include src="spelling_confirm_overlay.html"> 127 <include src="spelling_confirm_overlay.html">
128 <include src="startup_overlay.html"> 128 <include src="startup_overlay.html">
129 <include src="supervised_user_create_confirm.html"> 129 <include src="supervised_user_create_confirm.html">
130 <include src="website_settings.html">
131 <include src="../sync_setup_overlay.html"> 130 <include src="../sync_setup_overlay.html">
132 <if expr="chromeos"> 131 <if expr="chromeos">
133 <include src="chromeos/accounts_options.html"> 132 <include src="chromeos/accounts_options.html">
134 <include src="chromeos/bluetooth_add_device_overlay.html"> 133 <include src="chromeos/bluetooth_add_device_overlay.html">
135 <include src="chromeos/bluetooth_pair_device_overlay.html"> 134 <include src="chromeos/bluetooth_pair_device_overlay.html">
136 <include src="chromeos/change_picture_options.html"> 135 <include src="chromeos/change_picture_options.html">
137 <include src="chromeos/consumer_management_overlay.html"> 136 <include src="chromeos/consumer_management_overlay.html">
138 <include src="chromeos/display_options.html"> 137 <include src="chromeos/display_options.html">
139 <include src="chromeos/keyboard_overlay.html"> 138 <include src="chromeos/keyboard_overlay.html">
140 <include src="chromeos/pointer_overlay.html"> 139 <include src="chromeos/pointer_overlay.html">
141 <include src="factory_reset_overlay.html"> 140 <include src="factory_reset_overlay.html">
142 <include src="../help/help_page.html"> 141 <include src="../help/help_page.html">
143 </if> 142 </if>
144 <if expr="use_nss"> 143 <if expr="use_nss">
145 <include src="certificate_manager.html"> 144 <include src="certificate_manager.html">
146 </if> 145 </if>
147 </div> 146 </div>
148 <div id="overlay-container-2" class="overlay transparent" hidden> 147 <div id="overlay-container-2" class="overlay transparent" hidden>
149 <include src="alert_overlay.html"> 148 <include src="alert_overlay.html">
150 <include src="autofill_edit_address_overlay.html"> 149 <include src="autofill_edit_address_overlay.html">
151 <include src="autofill_edit_creditcard_overlay.html"> 150 <include src="autofill_edit_creditcard_overlay.html">
152 <include src="content_settings_exceptions_area.html"> 151 <include src="content_settings_exceptions_area.html">
153 <include src="cookies_view.html"> 152 <include src="cookies_view.html">
154 <include src="handler_options.html"> 153 <include src="handler_options.html">
155 <include src="language_add_language_overlay.html"> 154 <include src="language_add_language_overlay.html">
156 <include src="supervised_user_import.html"> 155 <include src="supervised_user_import.html">
157 <include src="supervised_user_learn_more.html"> 156 <include src="supervised_user_learn_more.html">
158 <include src="website_settings_edit_site.html"> 157 <include src="website_settings.html">
159 <if expr="not is_macosx"> 158 <if expr="not is_macosx">
160 <include src="language_dictionary_overlay.html"> 159 <include src="language_dictionary_overlay.html">
161 </if> 160 </if>
162 <if expr="chromeos"> 161 <if expr="chromeos">
163 <include src="chromeos/display_overscan.html"> 162 <include src="chromeos/display_overscan.html">
164 <include src="chromeos/internet_detail.html"> 163 <include src="chromeos/internet_detail.html">
165 <include src="chromeos/preferred_networks.html"> 164 <include src="chromeos/preferred_networks.html">
166 <include src="chromeos/third_party_ime_confirm_overlay.html"> 165 <include src="chromeos/third_party_ime_confirm_overlay.html">
167 <include src="../help/channel_change_page.html"> 166 <include src="../help/channel_change_page.html">
168 </if> 167 </if>
169 <if expr="not is_win and not is_macosx"> 168 <if expr="not is_win and not is_macosx">
170 <include src="certificate_restore_overlay.html"> 169 <include src="certificate_restore_overlay.html">
171 <include src="certificate_backup_overlay.html"> 170 <include src="certificate_backup_overlay.html">
172 <include src="certificate_edit_ca_trust_overlay.html"> 171 <include src="certificate_edit_ca_trust_overlay.html">
173 <include src="certificate_import_error_overlay.html"> 172 <include src="certificate_import_error_overlay.html">
174 </if> 173 </if>
174 <div id ="overlay-container-3" class="overlay transparent" hidden>
Bernhard Bauer 2014/09/15 09:13:49 Nit: no space before =
Daniel Nishi 2014/09/15 16:57:28 Done.
175 <include src="website_settings_edit_site.html">
176 </div>
175 </div> 177 </div>
176 <div id="extension-controlled-settings-bubble-template" hidden> 178 <div id="extension-controlled-settings-bubble-template" hidden>
177 <div class="controlled-setting-bubble-content-row"> 179 <div class="controlled-setting-bubble-content-row">
178 <div class="controlled-setting-bubble-extension-name"></div> 180 <div class="controlled-setting-bubble-extension-name"></div>
179 </div> 181 </div>
180 <div class="controlled-setting-bubble-content-row"> 182 <div class="controlled-setting-bubble-content-row">
181 <button class="controlled-setting-bubble-extension-manage-link link-button" 183 <button class="controlled-setting-bubble-extension-manage-link link-button"
182 i18n-content="controlledSettingManageExtension"></button> 184 i18n-content="controlledSettingManageExtension"></button>
183 <button class='controlled-setting-bubble-extension-disable-button' 185 <button class='controlled-setting-bubble-extension-disable-button'
184 i18n-content="controlledSettingDisableExtension"></button> 186 i18n-content="controlledSettingDisableExtension"></button>
(...skipping 17 matching lines...) Expand all
202 <include src="search_page.html"> 204 <include src="search_page.html">
203 <include src="browser_options.html"> 205 <include src="browser_options.html">
204 </div> 206 </div>
205 </div> 207 </div>
206 </div> 208 </div>
207 </div> 209 </div>
208 210
209 <script src="chrome://resources/js/i18n_template2.js"></script> 211 <script src="chrome://resources/js/i18n_template2.js"></script>
210 </body> 212 </body>
211 </html> 213 </html>
OLDNEW
« chrome/browser/resources/options/content_settings.html ('K') | « chrome/browser/resources/options/content_settings.js ('k') | chrome/browser/resources/options/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698