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

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

Issue 10545128: Unrevert r141537: Add extensions::StateStore and use that instead of (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix.crash Created 8 years, 6 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_system.cc
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index e0e5165e4609640779211f0eed42c136b28a9527..a5793e41b27f5d086b3193ff07fa1bb11ff699e6 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -27,6 +27,7 @@
#include "chrome/browser/extensions/extension_system_factory.h"
#include "chrome/browser/extensions/lazy_background_task_queue.h"
#include "chrome/browser/extensions/management_policy.h"
+#include "chrome/browser/extensions/state_store.h"
#include "chrome/browser/extensions/unpacked_installer.h"
#include "chrome/browser/extensions/user_script_master.h"
#include "chrome/browser/prefs/pref_service.h"
@@ -83,6 +84,10 @@ void ExtensionSystemImpl::Shared::InitPrefs() {
profile_->GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
ExtensionPrefValueMapFactory::GetForProfile(profile_)));
extension_prefs_->Init(extensions_disabled);
+
+ state_store_.reset(new extensions::StateStore(
+ profile_,
+ profile_->GetPath().AppendASCII(ExtensionService::kStateStoreName)));
}
void ExtensionSystemImpl::Shared::RegisterManagementPolicyProviders() {
@@ -196,6 +201,10 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
rules_registry_service_->RegisterDefaultRulesRegistries();
}
+extensions::StateStore* ExtensionSystemImpl::Shared::state_store() {
+ return state_store_.get();
+}
+
ExtensionService* ExtensionSystemImpl::Shared::extension_service() {
return extension_service_.get();
}
@@ -298,6 +307,10 @@ extensions::AlarmManager* ExtensionSystemImpl::alarm_manager() {
return alarm_manager_.get();
}
+extensions::StateStore* ExtensionSystemImpl::state_store() {
+ return shared_->state_store();
+}
+
ExtensionInfoMap* ExtensionSystemImpl::info_map() {
return shared_->info_map();
}
« no previous file with comments | « chrome/browser/extensions/extension_system.h ('k') | chrome/browser/extensions/settings/settings_backend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698