| 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..900eab4d5a0185939dbba4a0aa8ad497370547dc 100644
|
| --- a/chrome/browser/extensions/extension_system.cc
|
| +++ b/chrome/browser/extensions/extension_system.cc
|
| @@ -9,10 +9,13 @@
|
| #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/api/serial/serial_connection.h"
|
| +#include "chrome/browser/extensions/api/socket/socket.h"
|
| +#include "chrome/browser/extensions/api/usb/usb_device_resource.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 +281,17 @@ 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>());
|
| + serial_connection_manager_->set_thread_id(BrowserThread::FILE);
|
| +
|
| + socket_manager_.reset(new ApiResourceManager<Socket>());
|
| + socket_manager_->set_thread_id(BrowserThread::IO);
|
| +
|
| + usb_device_resource_manager_.reset(
|
| + new ApiResourceManager<UsbDeviceResource>());
|
| + usb_device_resource_manager_->set_thread_id(BrowserThread::IO);
|
|
|
| shared_->Init(extensions_enabled);
|
| }
|
| @@ -334,6 +346,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;
|
|
|