Add a global on/off switch for content settings and expose a toggle on the Website Settings options…

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 33ead5e7d3095050b3367111654526a9c820e062..ca3c83b2f758b737263fff48411e00146884de5b 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -990,6 +990,11 @@ const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
 // Dictionary of content settings applied to all hosts by default.
 const char kDefaultContentSettings[] = "profile.default_content_settings";
 
+// Dictionary of content settings that can globally disallow all hosts by
+// default. If a value is set, it means the setting is globally disallowed.
+// If a value is not set, it means the setting is allowed.

[Bernhard Bauer, 2014/09/15 09:17:16]

Please also explain that in that case, we will fall through to other content
settings (which might also block it).

[Daniel Nishi, 2014/09/15 17:40:51]

Done.

+const char kOverrideContentSettings[] = "profile.override_content_settings";
+
 // Boolean indicating whether the clear on exit pref was migrated to content
 // settings yet.
 const char kContentSettingsClearOnExitMigrated[] =