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

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 7189029: Implement an initial extension settings API. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Make clang happy Created 9 years, 4 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 | « chrome/browser/extensions/extension_service.h ('k') | chrome/browser/extensions/extension_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 5c05c6cb9b16dba738258e193fd3224aac37b1c0..5d9d9c3ed57b52e76e6a85d01ac49023dfe4f5ad 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -223,6 +223,7 @@ ExtensionService::NaClModuleInfo::~NaClModuleInfo() {
const char* ExtensionService::kInstallDirectoryName = "Extensions";
const char* ExtensionService::kCurrentVersionFileName = "Current Version";
+const char* ExtensionService::kSettingsDirectoryName = "Extension Settings";
// Implements IO for the ExtensionService.
@@ -543,12 +544,14 @@ ExtensionService::ExtensionService(Profile* profile,
const CommandLine* command_line,
const FilePath& install_directory,
ExtensionPrefs* extension_prefs,
+ ExtensionSettings* extension_settings,
bool autoupdate_enabled,
bool extensions_enabled)
: weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
method_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
profile_(profile),
extension_prefs_(extension_prefs),
+ extension_settings_(extension_settings),
pending_extension_manager_(*ALLOW_THIS_IN_INITIALIZER_LIST(this)),
install_directory_(install_directory),
extensions_enabled_(extensions_enabled),
@@ -1573,6 +1576,10 @@ ExtensionPrefs* ExtensionService::extension_prefs() {
return extension_prefs_;
}
+ExtensionSettings* ExtensionService::extension_settings() {
+ return extension_settings_;
+}
+
ExtensionContentSettingsStore*
ExtensionService::GetExtensionContentSettingsStore() {
return extension_prefs()->content_settings_store();
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/browser/extensions/extension_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698