Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Side by Side Diff: chrome/browser/content_settings/content_settings_internal_extension_provider.h

Issue 276573011: Remove deprecated extension notification from content_settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove observer from ShutdownOnUIThread Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_INTERNAL_EXTENSION_PROV IDER_H_ 5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_INTERNAL_EXTENSION_PROV IDER_H_
6 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_INTERNAL_EXTENSION_PROV IDER_H_ 6 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_INTERNAL_EXTENSION_PROV IDER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/synchronization/lock.h" 9 #include "base/synchronization/lock.h"
10 #include "chrome/browser/content_settings/content_settings_observable_provider.h " 10 #include "chrome/browser/content_settings/content_settings_observable_provider.h "
11 #include "chrome/browser/content_settings/content_settings_origin_identifier_val ue_map.h" 11 #include "chrome/browser/content_settings/content_settings_origin_identifier_val ue_map.h"
12 #include "components/content_settings/core/common/content_settings.h" 12 #include "components/content_settings/core/common/content_settings.h"
13 #include "content/public/browser/notification_observer.h" 13 #include "content/public/browser/notification_observer.h"
14 #include "content/public/browser/notification_registrar.h" 14 #include "content/public/browser/notification_registrar.h"
15 #include "extensions/browser/extension_registry_observer.h"
15 16
16 class ExtensionService; 17 class ExtensionService;
17 18
18 namespace extensions { 19 namespace extensions {
19 class Extension; 20 class Extension;
21 class ExtensionRegistry;
20 } 22 }
21 23
22 namespace content_settings { 24 namespace content_settings {
23 25
24 // A content settings provider which disables certain plugins for platform apps. 26 // A content settings provider which disables certain plugins for platform apps.
25 class InternalExtensionProvider : public ObservableProvider, 27 class InternalExtensionProvider : public ObservableProvider,
26 public content::NotificationObserver { 28 public content::NotificationObserver,
29 public extensions::ExtensionRegistryObserver {
27 public: 30 public:
28 explicit InternalExtensionProvider(ExtensionService* extension_service); 31 explicit InternalExtensionProvider(ExtensionService* extension_service);
29 32
30 virtual ~InternalExtensionProvider(); 33 virtual ~InternalExtensionProvider();
31 34
32 // ProviderInterface methods: 35 // ProviderInterface methods:
33 virtual RuleIterator* GetRuleIterator( 36 virtual RuleIterator* GetRuleIterator(
34 ContentSettingsType content_type, 37 ContentSettingsType content_type,
35 const ResourceIdentifier& resource_identifier, 38 const ResourceIdentifier& resource_identifier,
36 bool incognito) const OVERRIDE; 39 bool incognito) const OVERRIDE;
37 40
38 virtual bool SetWebsiteSetting( 41 virtual bool SetWebsiteSetting(
39 const ContentSettingsPattern& primary_pattern, 42 const ContentSettingsPattern& primary_pattern,
40 const ContentSettingsPattern& secondary_pattern, 43 const ContentSettingsPattern& secondary_pattern,
41 ContentSettingsType content_type, 44 ContentSettingsType content_type,
42 const ResourceIdentifier& resource_identifier, 45 const ResourceIdentifier& resource_identifier,
43 base::Value* value) OVERRIDE; 46 base::Value* value) OVERRIDE;
44 47
45 virtual void ClearAllContentSettingsRules(ContentSettingsType content_type) 48 virtual void ClearAllContentSettingsRules(ContentSettingsType content_type)
46 OVERRIDE; 49 OVERRIDE;
47 50
48 virtual void ShutdownOnUIThread() OVERRIDE; 51 virtual void ShutdownOnUIThread() OVERRIDE;
49 52
50 // content::NotificationObserver implementation. 53 // content::NotificationObserver implementation.
51 virtual void Observe(int type, 54 virtual void Observe(int type,
52 const content::NotificationSource& source, 55 const content::NotificationSource& source,
53 const content::NotificationDetails& details) OVERRIDE; 56 const content::NotificationDetails& details) OVERRIDE;
57
58 // extensions::ExtensionRegistryObserver implementation.
59 virtual void OnExtensionLoaded(
60 content::BrowserContext* browser_context,
61 const extensions::Extension* extension) OVERRIDE;
62 virtual void OnExtensionUnloaded(
63 content::BrowserContext* browser_context,
64 const extensions::Extension* extension,
65 extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE;
66
54 private: 67 private:
55 void SetContentSettingForExtension(const extensions::Extension* extension, 68 void SetContentSettingForExtension(const extensions::Extension* extension,
56 ContentSetting setting); 69 ContentSetting setting);
57 void SetContentSettingForExtensionAndResource( 70 void SetContentSettingForExtensionAndResource(
58 const extensions::Extension* extension, 71 const extensions::Extension* extension,
59 const ResourceIdentifier& resource, 72 const ResourceIdentifier& resource,
60 ContentSetting setting); 73 ContentSetting setting);
61 74
62 OriginIdentifierValueMap value_map_; 75 OriginIdentifierValueMap value_map_;
63 76
64 // Used around accesses to the |value_map_| list to guarantee thread safety. 77 // Used around accesses to the |value_map_| list to guarantee thread safety.
65 mutable base::Lock lock_; 78 mutable base::Lock lock_;
66 scoped_ptr<content::NotificationRegistrar> registrar_; 79 scoped_ptr<content::NotificationRegistrar> registrar_;
67 80
81 extensions::ExtensionRegistry* extension_registry_; // Not owned.
82
68 DISALLOW_COPY_AND_ASSIGN(InternalExtensionProvider); 83 DISALLOW_COPY_AND_ASSIGN(InternalExtensionProvider);
69 }; 84 };
70 85
71 } // namespace content_settings 86 } // namespace content_settings
72 87
73 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_INTERNAL_EXTENSION_P ROVIDER_H_ 88 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_INTERNAL_EXTENSION_P ROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698