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

chrome/browser/content_settings/host_content_settings_map.h

 // 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.
 
 // Maps hostnames to custom content settings.  Written on the UI thread and read
 // on any thread.  One instance per profile.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/threading/platform_thread.h"
 #include "base/tuple.h"
 #include "chrome/browser/content_settings/content_settings_observer.h"
+#include "chrome/browser/content_settings/content_settings_override_provider.h"
 #include "chrome/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 
 class ExtensionService;
 class GURL;
 class PrefService;
 
 namespace base {
 class Clock;
 class Value;
 }
 
 namespace content_settings {
+class OverrideProvider;
 class ProviderInterface;
 class PrefProvider;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 class HostContentSettingsMap
     : public content_settings::Observer,
@@ skipping 195 matching lines @@
                           const GURL& secondary_url,
                           ContentSettingsType content_type);
 
   // Returns the last time the pattern has requested permission for the
   // |content_type| setting.
   base::Time GetLastUsageByPattern(
       const ContentSettingsPattern& primary_pattern,
       const ContentSettingsPattern& secondary_pattern,
       ContentSettingsType content_type);
 
+  // Returns the content setting without considering the global on/off toggle
+  // for the content setting that matches the URLs.
+  ContentSetting GetContentSettingWithoutOverride(
+      const GURL& primary_url,
+      const GURL& secondary_url,
+      ContentSettingsType content_type,
+      const std::string& resource_identifier);
+
+  // Returns the single content setting |value| without considering the
+  // global on/off toggle for the content setting that matches the given
+  // patterns.
+  // The ownership of the resulting |Value| is transfered to the caller.

[Bernhard Bauer, 2014/09/10 09:07:18]

If you transfer ownership, consider returning a scoped_ptr.

[Daniel Nishi, 2014/09/10 16:38:29]

This made me realize that GetWebsiteSetting() was never used outside of
immediately putting the base::Value* into a scoped_ptr.

I've changed the ownership passing all the way up to passing a scoped_ptr.

+  base::Value* GetWebsiteSettingWithoutOverride(
+      const GURL& primary_url,
+      const GURL& secondary_url,
+      ContentSettingsType content_type,
+      const std::string& resource_identifier,
+      content_settings::SettingInfo* info) const;
+
+  // Sets globally if a given |content_type| |is_enabled|.
+  void SetContentSettingOverride(ContentSettingsType content_type,
+                                 bool is_enabled);
+
+  // Returns if a given |content_type| is enabled.
+  bool GetContentSettingOverride(ContentSettingsType content_type);
+
   // Adds/removes an observer for content settings changes.
   void AddObserver(content_settings::Observer* observer);
   void RemoveObserver(content_settings::Observer* observer);
 
   // Passes ownership of |clock|.
   void SetPrefClockForTesting(scoped_ptr<base::Clock> clock);
 
  private:
   friend class base::RefCountedThreadSafe<HostContentSettingsMap>;
   friend class HostContentSettingsMapTest_NonDefaultSettings_Test;
@@ skipping 46 matching lines @@
   // Weak; owned by the Profile.
   PrefService* prefs_;
 
   // Whether this settings map is for an OTR session.
   bool is_off_the_record_;
 
   // Content setting providers. This is only modified at construction
   // time and by RegisterExtensionService, both of which should happen
   // before any other uses of it.
   ProviderMap content_settings_providers_;
+  content_settings::OverrideProvider override_;
 
   ObserverList<content_settings::Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_