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

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

Issue 10777003: Refactor APIResourceController to ProfileKeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge/antony/fix build. Created 8 years, 5 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_system.h ('k') | chrome/browser/extensions/test_extension_system.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_system.cc
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index bb398542e6b63a287f532ab3cd1a98b7b6443ba2..1118e0f1e7cf163d709fa6132beca82b3203632d 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -9,10 +9,10 @@
#include "base/file_path.h"
#include "base/string_tokenizer.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/extensions/component_loader.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/component_loader.h"
#include "chrome/browser/extensions/extension_devtools_manager.h"
#include "chrome/browser/extensions/extension_error_reporter.h"
#include "chrome/browser/extensions/extension_event_router.h"
@@ -278,8 +278,13 @@ void ExtensionSystemImpl::Init(bool extensions_enabled) {
shared_->InitInfoMap();
extension_process_manager_.reset(ExtensionProcessManager::Create(profile_));
- alarm_manager_.reset(new AlarmManager(profile_,
- &base::Time::Now));
+ alarm_manager_.reset(new AlarmManager(profile_, &base::Time::Now));
+
+ serial_connection_manager_.reset(new ApiResourceManager<SerialConnection>(
+ BrowserThread::FILE));
+ socket_manager_.reset(new ApiResourceManager<Socket>(BrowserThread::IO));
+ usb_device_resource_manager_.reset(
+ new ApiResourceManager<UsbDeviceResource>(BrowserThread::IO));
shared_->Init(extensions_enabled);
}
@@ -334,6 +339,20 @@ RulesRegistryService* ExtensionSystemImpl::rules_registry_service() {
return shared_->rules_registry_service();
}
+ApiResourceManager<SerialConnection>*
+ExtensionSystemImpl::serial_connection_manager() {
+ return serial_connection_manager_.get();
+}
+
+ApiResourceManager<Socket>*ExtensionSystemImpl::socket_manager() {
+ return socket_manager_.get();
+}
+
+ApiResourceManager<UsbDeviceResource>*
+ExtensionSystemImpl::usb_device_resource_manager() {
+ return usb_device_resource_manager_.get();
+}
+
void ExtensionSystemImpl::RegisterExtensionWithRequestContexts(
const Extension* extension) {
base::Time install_time;
« no previous file with comments | « chrome/browser/extensions/extension_system.h ('k') | chrome/browser/extensions/test_extension_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698