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

Unified Diff: chrome/browser/content_settings/content_settings_extension_provider.h

Issue 10381097: Move content settings extension API to content_settings dir. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed conflict Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/content_settings/content_settings_extension_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/content_settings_extension_provider.h
diff --git a/chrome/browser/content_settings/content_settings_extension_provider.h b/chrome/browser/content_settings/content_settings_extension_provider.h
index 0d181118728d8583276ccfdc828cbc3b15a67d55..3e2a94b8be9e0ca321178b42b1077f6e43c3e1f3 100644
--- a/chrome/browser/content_settings/content_settings_extension_provider.h
+++ b/chrome/browser/content_settings/content_settings_extension_provider.h
@@ -9,15 +9,15 @@
#include "base/memory/ref_counted.h"
#include "chrome/browser/content_settings/content_settings_observable_provider.h"
-#include "chrome/browser/extensions/extension_content_settings_store.h"
+#include "chrome/browser/extensions/api/content_settings/content_settings_store.h"
namespace content_settings {
// A content settings provider which manages settings defined by extensions.
class ExtensionProvider : public ObservableProvider,
- public ExtensionContentSettingsStore::Observer {
+ public extensions::ContentSettingsStore::Observer {
public:
- ExtensionProvider(ExtensionContentSettingsStore* extensions_settings,
+ ExtensionProvider(extensions::ContentSettingsStore* extensions_settings,
bool incognito);
virtual ~ExtensionProvider();
@@ -40,7 +40,7 @@ class ExtensionProvider : public ObservableProvider,
virtual void ShutdownOnUIThread() OVERRIDE;
- // ExtensionContentSettingsStore::Observer methods:
+ // extensions::ContentSettingsStore::Observer methods:
virtual void OnContentSettingChanged(const std::string& extension_id,
bool incognito) OVERRIDE;
@@ -50,7 +50,7 @@ class ExtensionProvider : public ObservableProvider,
bool incognito_;
// The backend storing content setting rules defined by extensions.
- scoped_refptr<ExtensionContentSettingsStore> extensions_settings_;
+ scoped_refptr<extensions::ContentSettingsStore> extensions_settings_;
DISALLOW_COPY_AND_ASSIGN(ExtensionProvider);
};
« no previous file with comments | « no previous file | chrome/browser/content_settings/content_settings_extension_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698