summaryrefslogtreecommitdiffstats
path: root/extensions/browser/test_extensions_browser_client.h
diff options
context:
space:
mode:
authorrockot@google.com <rockot@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-02 22:52:20 +0000
committerrockot@google.com <rockot@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-02 22:52:20 +0000
commitd31e2484add25de2f07a69773d319ebc86210369 (patch)
treef8a83200bd5898bb4f505109c5cec96c1aaa17fc /extensions/browser/test_extensions_browser_client.h
parent8bc11e1090c3779cff89ec9d27b78d6d5a86a4af (diff)
downloadchromium_src-d31e2484add25de2f07a69773d319ebc86210369.zip
chromium_src-d31e2484add25de2f07a69773d319ebc86210369.tar.gz
chromium_src-d31e2484add25de2f07a69773d319ebc86210369.tar.bz2
Remove //chrome dependency from ExtensionPrefs
ExtensionPrefs::Observer has been extended with additional methods to accomodate the needs of Chrome's contentSettings API implementation. The ContentSettingsStore instance which was previously hosted by ExtensionPrefs is now hosted by an independent (BCKS) ContentSettingsService. ExtensionsBrowserClient gets a new method to allow a client to inject ExtensionPrefs observers between construction and initialization. Chrome's implementation ensures that a ContentSettingsStore exists and adds it as an ExtensionPrefs observer. Somewhat unfortunately this means that ExtensionPrefs construction and initialization has been partially split to allow observers to be added prior to initialization. BUG=357749,162530 R=jamescook@chromium.org, yoz@chromium.org TBR=bauerb@chromium.org for c/b/content_settings, finnur@chromium.org for c/b/ui/webui/extensions Review URL: https://codereview.chromium.org/220353002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261207 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/browser/test_extensions_browser_client.h')
-rw-r--r--extensions/browser/test_extensions_browser_client.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/extensions/browser/test_extensions_browser_client.h b/extensions/browser/test_extensions_browser_client.h
index 19f33d7..c0e83c3 100644
--- a/extensions/browser/test_extensions_browser_client.h
+++ b/extensions/browser/test_extensions_browser_client.h
@@ -44,6 +44,9 @@ class TestExtensionsBrowserClient : public ExtensionsBrowserClient {
content::BrowserContext* context) const OVERRIDE;
virtual PrefService* GetPrefServiceForContext(
content::BrowserContext* context) OVERRIDE;
+ virtual void GetEarlyExtensionPrefsObservers(
+ content::BrowserContext* context,
+ std::vector<ExtensionPrefsObserver*>* observers) const OVERRIDE;
virtual bool DeferLoadingBackgroundHosts(
content::BrowserContext* context) const OVERRIDE;
virtual bool IsBackgroundPageAllowed(content::BrowserContext* context) const