Expose the Website Settings page in the Content Setting page if it is enabled via flag.

chrome/browser/resources/options/options.html

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..969b4a78b762b9f29f53e1d9036e8d172860e8df 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>

[Bernhard Bauer, 2014/09/15 09:13:49]

Nit: no space before =

[Daniel Nishi, 2014/09/15 16:57:28]

Done.

+  <include src="website_settings_edit_site.html">
+</div>
 </div>
 <div id="extension-controlled-settings-bubble-template" hidden>
   <div class="controlled-setting-bubble-content-row">