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

Unified 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: Handler strings are handled elsewhere. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/options/content_settings.js ('k') | chrome/browser/resources/options/options.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/options.html
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index 988ff3fc7640f9ad130853806171829e36b5e89b..34a7e9414dbe76a67d05bf557502a22f3ead91df 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -127,7 +127,6 @@
<include src="spelling_confirm_overlay.html">
<include src="startup_overlay.html">
<include src="supervised_user_create_confirm.html">
- <include src="website_settings.html">
<include src="../sync_setup_overlay.html">
<if expr="chromeos">
<include src="chromeos/accounts_options.html">
@@ -155,7 +154,7 @@
<include src="language_add_language_overlay.html">
<include src="supervised_user_import.html">
<include src="supervised_user_learn_more.html">
- <include src="website_settings_edit_site.html">
+ <include src="website_settings.html">
<if expr="not is_macosx">
<include src="language_dictionary_overlay.html">
</if>
@@ -172,6 +171,9 @@
<include src="certificate_edit_ca_trust_overlay.html">
<include src="certificate_import_error_overlay.html">
</if>
+<div id="overlay-container-3" class="overlay transparent" hidden>
+ <include src="website_settings_edit_site.html">
+</div>
</div>
<div id="extension-controlled-settings-bubble-template" hidden>
<div class="controlled-setting-bubble-content-row">
« no previous file with comments | « 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