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

Unified Diff: chrome/browser/extensions/extension_service.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
Index: chrome/browser/extensions/extension_service.h
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 928b96e76e0091f4ee1e5db87779882705f0946c..7c36f8ca35dea044a15c9ffe705983493382ff33 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -51,7 +51,6 @@ class AppNotificationManager;
class BookmarkExtensionEventRouter;
class CrxInstaller;
class ExtensionBrowserEventRouter;
-class ExtensionContentSettingsStore;
class ExtensionDownloadsEventRouter;
class ExtensionFontSettingsEventRouter;
class ExtensionGlobalError;
@@ -78,6 +77,7 @@ namespace extensions {
class APIResourceController;
class AppSyncData;
class ComponentLoader;
+class ContentSettingsStore;
class ExtensionCookiesEventRouter;
class ExtensionSyncData;
class ExtensionUpdater;
@@ -473,7 +473,7 @@ class ExtensionService
extensions::SettingsFrontend* settings_frontend();
- ExtensionContentSettingsStore* GetExtensionContentSettingsStore();
+ extensions::ContentSettingsStore* GetContentSettingsStore();
// Whether the extension service is ready.
virtual bool is_ready() OVERRIDE;
« no previous file with comments | « chrome/browser/extensions/extension_prefs_unittest.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698