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

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

Issue 13825014: Change RulesRegistryService to use ProfileKeyedAPI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Convenience method and fixed line wrapping Created 7 years, 8 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 2127e00c63beabb69c888da17c575b6761df49f6..e36667ba18c3fc8041cc7a321772c9c341d840f2 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -13,7 +13,6 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/cookie_settings.h"
#include "chrome/browser/extensions/api/alarms/alarm_manager.h"
-#include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
#include "chrome/browser/extensions/api/location/location_manager.h"
#include "chrome/browser/extensions/api/messaging/message_service.h"
#include "chrome/browser/extensions/blacklist.h"
@@ -321,8 +320,6 @@ ExtensionSystemImpl::ExtensionSystemImpl(Profile* profile)
}
ExtensionSystemImpl::~ExtensionSystemImpl() {
- if (rules_registry_service_)
- rules_registry_service_->Shutdown();
}
void ExtensionSystemImpl::Shutdown() {
@@ -352,23 +349,9 @@ void ExtensionSystemImpl::InitForRegularProfile(bool extensions_enabled) {
usb_device_resource_manager_.reset(
new ApiResourceManager<UsbDeviceResource>(BrowserThread::IO));
- rules_registry_service_.reset(new RulesRegistryService(profile_));
- rules_registry_service_->RegisterDefaultRulesRegistries();
-
shared_->Init(extensions_enabled);
}
-void ExtensionSystemImpl::InitForOTRProfile() {
- // Only initialize the RulesRegistryService of the OTR ExtensionSystem if the
- // regular ExtensionSystem has been initialized properly, as we depend on it.
- // Some ChromeOS browser tests don't initialize the regular ExtensionSystem
- // in login-tests.
- if (extension_service()) {
- rules_registry_service_.reset(new RulesRegistryService(profile_));
- rules_registry_service_->RegisterDefaultRulesRegistries();
- }
-}
-
ExtensionService* ExtensionSystemImpl::extension_service() {
return shared_->extension_service();
}
@@ -425,10 +408,6 @@ EventRouter* ExtensionSystemImpl::event_router() {
return shared_->event_router();
}
-RulesRegistryService* ExtensionSystemImpl::rules_registry_service() {
- return rules_registry_service_.get();
-}
-
ApiResourceManager<SerialConnection>*
ExtensionSystemImpl::serial_connection_manager() {
return serial_connection_manager_.get();

Powered by Google App Engine
This is Rietveld 408576698