diff options
author | juncai <juncai@chromium.org> | 2015-06-03 17:14:04 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-04 00:14:37 +0000 |
commit | cf52333148db8abf73adbb739480edaca3646fe5 (patch) | |
tree | 0c50247857c81587682dba497496abf0921093d7 /extensions/shell | |
parent | b6e2e1cf2ab03954db07966f4bfd9f03763f6084 (diff) | |
download | chromium_src-cf52333148db8abf73adbb739480edaca3646fe5.zip chromium_src-cf52333148db8abf73adbb739480edaca3646fe5.tar.gz chromium_src-cf52333148db8abf73adbb739480edaca3646fe5.tar.bz2 |
Extract EventRouter from ExtensionSystem.
This patch removes event_router accessor from ExtensionSystem.
EventRouter is now a browser context keyed service.
BUG=496281
Review URL: https://codereview.chromium.org/1148983004
Cr-Commit-Position: refs/heads/master@{#332745}
Diffstat (limited to 'extensions/shell')
-rw-r--r-- | extensions/shell/browser/shell_extension_system.cc | 7 | ||||
-rw-r--r-- | extensions/shell/browser/shell_extension_system.h | 4 |
2 files changed, 0 insertions, 11 deletions
diff --git a/extensions/shell/browser/shell_extension_system.cc b/extensions/shell/browser/shell_extension_system.cc index e5cabb7..e5f5a52 100644 --- a/extensions/shell/browser/shell_extension_system.cc +++ b/extensions/shell/browser/shell_extension_system.cc @@ -14,7 +14,6 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/api/app_runtime/app_runtime_api.h" -#include "extensions/browser/event_router.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/info_map.h" @@ -97,8 +96,6 @@ void ShellExtensionSystem::Shutdown() { void ShellExtensionSystem::InitForRegularProfile(bool extensions_enabled) { runtime_data_.reset( new RuntimeData(ExtensionRegistry::Get(browser_context_))); - event_router_.reset( - new EventRouter(browser_context_, ExtensionPrefs::Get(browser_context_))); quota_service_.reset(new QuotaService); } @@ -132,10 +129,6 @@ InfoMap* ShellExtensionSystem::info_map() { return info_map_.get(); } -EventRouter* ShellExtensionSystem::event_router() { - return event_router_.get(); -} - QuotaService* ShellExtensionSystem::quota_service() { return quota_service_.get(); } diff --git a/extensions/shell/browser/shell_extension_system.h b/extensions/shell/browser/shell_extension_system.h index d4db30c..2cbdd5f 100644 --- a/extensions/shell/browser/shell_extension_system.h +++ b/extensions/shell/browser/shell_extension_system.h @@ -23,8 +23,6 @@ class BrowserContext; namespace extensions { -class DeclarativeUserScriptManager; -class EventRouter; class InfoMap; class ProcessManager; class RendererStartupHelper; @@ -59,7 +57,6 @@ class ShellExtensionSystem : public ExtensionSystem { StateStore* state_store() override; StateStore* rules_store() override; InfoMap* info_map() override; - EventRouter* event_router() override; QuotaService* quota_service() override; void RegisterExtensionWithRequestContexts( const Extension* extension) override; @@ -78,7 +75,6 @@ class ShellExtensionSystem : public ExtensionSystem { scoped_refptr<InfoMap> info_map_; scoped_ptr<RuntimeData> runtime_data_; - scoped_ptr<EventRouter> event_router_; scoped_ptr<QuotaService> quota_service_; // Signaled when the extension system has completed its startup tasks. |