Make the hcsm and its providers communicate via an observer interface.

chrome/browser/content_settings/host_content_settings_map.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/content_settings/content_settings_pattern.h"
+#include "chrome/browser/content_settings/content_settings_observer.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/common/content_settings.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
 namespace content_settings {
 class DefaultProviderInterface;
-class ProviderInterface;
+class AbstractProvider;
 }  // namespace content_settings
 
 class ContentSettingsDetails;
 class DictionaryValue;
 class ExtensionService;
 class GURL;
 class PrefService;
 class Profile;
 
 class HostContentSettingsMap
-    : public NotificationObserver,
+    : public content_settings::Observer,
+      public NotificationObserver,
       public base::RefCountedThreadSafe<HostContentSettingsMap> {
  public:
   typedef Tuple3<ContentSettingsPattern, ContentSetting, std::string>
       PatternSettingSourceTriple;
   typedef std::vector<PatternSettingSourceTriple> SettingsForOneType;
 
   HostContentSettingsMap(PrefService* prefs,
                          ExtensionService* extension_service,
                          bool incognito);
 
@@ skipping 131 matching lines @@
 
   // Returns true if the default setting for the |content_type| is managed.
   bool IsDefaultContentSettingManaged(ContentSettingsType content_type) const;
 
   // Detaches the HostContentSettingsMap from all Profile-related objects like
   // PrefService. This methods needs to be called before destroying the Profile.
   // Afterwards, none of the methods above that should only be called on the UI
   // thread should be called anymore.
   void ShutdownOnUIThread();
 
+  // ProviderObserverInterface implementation.

[Bernhard Bauer, 2011/07/13 07:58:18]

Nit: The interface is called just |content_settings::Observer| now?

[markusheintz_, 2011/07/13 12:48:16]

Done.

+  virtual void OnContentSettingChanged(
+      const ContentSettingsDetails& details);
+
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
  private:
   friend class base::RefCountedThreadSafe<HostContentSettingsMap>;
 
   virtual ~HostContentSettingsMap();
 
@@ skipping 17 matching lines @@
 
   // Whether we are currently updating preferences, this is used to ignore
   // notifications from the preferences service that we triggered ourself.
   bool updating_preferences_;
 
   // Default content setting providers.
   std::vector<linked_ptr<content_settings::DefaultProviderInterface> >
       default_content_settings_providers_;
 
   // Content setting providers.
-  std::vector<linked_ptr<content_settings::ProviderInterface> >
+  std::vector<linked_ptr<content_settings::AbstractProvider> >

[Bernhard Bauer, 2011/07/13 07:58:18]

Wait, I think we should still use the base interface here; that's the whole
point of having one ;-)

[markusheintz_, 2011/07/13 12:48:16]

Oh yeah. Forgot to change that back. Initially I registered the observer with
the AddObserver methoded and then the ProviderInterface didn't work.

Change back to ProviderInterface

       content_settings_providers_;
 
   // Used around accesses to the following objects to guarantee thread safety.
   mutable base::Lock lock_;
 
   // Misc global settings.
   bool block_third_party_cookies_;
   bool is_block_third_party_cookies_managed_;
 
   DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_