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

chrome/common/pref_names.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/pref_names.h"
 
 #include "base/basictypes.h"
 #include "chrome/common/pref_font_webkit_names.h"
 
 namespace prefs {
@@ skipping 972 matching lines @@
     "browser.show_update_promotion_info_bar";
 #endif
 
 // Boolean that is false if we should show window manager decorations.  If
 // true, we draw a custom chrome frame (thicker title bar and blue border).
 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[] =
     "profile.content_settings.clear_on_exit_migrated";
 
 // Version of the pattern format used to define content settings.
 const char kContentSettingsVersion[] = "profile.content_settings.pref_version";
 
 // Patterns for mapping origins to origin related settings. Default settings
 // will be applied to origins that don't match any of the patterns. The pattern
@@ skipping 1314 matching lines @@
 // Whether DNS Quick Check is disabled in proxy resolution.
 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
 
 // Whether Guest Mode is enabled within the browser.
 const char kBrowserGuestModeEnabled[] = "profile.browser_guest_enabled";
 
 // Whether Adding a new Person is enabled within the user manager.
 const char kBrowserAddPersonEnabled[] = "profile.add_person_enabled";
 
 }  // namespace prefs