diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 12:01:15 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 12:01:15 +0000 |
| commit | 3ce02419d4f7b3cd1fc062f87fb63a78072b5483 (patch) | |
| tree | 6bdbb2cc363827fe8fb6186d5cbf5787f5aaf29d /chrome/browser/browser_process_impl.cc | |
| parent | af3f286560a8fadb4eb6cb51c7ba2cb0f8e17a66 (diff) | |
| download | chromium_src-3ce02419d4f7b3cd1fc062f87fb63a78072b5483.zip chromium_src-3ce02419d4f7b3cd1fc062f87fb63a78072b5483.tar.gz chromium_src-3ce02419d4f7b3cd1fc062f87fb63a78072b5483.tar.bz2 | |
Make the ChromeNetworkDelegate use the ExtensionEventRouterForwarder
BUG=73903
TEST=tests for proxy and webrequest API should still work
Review URL: http://codereview.chromium.org/6598002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index a168a61..7579efc 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -24,6 +24,7 @@ #include "chrome/browser/debugger/devtools_protocol_handler.h" #include "chrome/browser/download/download_file_manager.h" #include "chrome/browser/download/save_file_manager.h" +#include "chrome/browser/extensions/extension_event_router_forwarder.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/icon_manager.h" @@ -124,6 +125,8 @@ BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line) shutdown_event_.reset(new base::WaitableEvent(true, false)); net_log_.reset(new ChromeNetLog); + + extension_event_router_forwarder_ = new ExtensionEventRouterForwarder; } BrowserProcessImpl::~BrowserProcessImpl() { @@ -423,6 +426,11 @@ ui::Clipboard* BrowserProcessImpl::clipboard() { return clipboard_.get(); } +ExtensionEventRouterForwarder* +BrowserProcessImpl::extension_event_router_forwarder() { + return extension_event_router_forwarder_.get(); +} + NotificationUIManager* BrowserProcessImpl::notification_ui_manager() { DCHECK(CalledOnValidThread()); if (!created_notification_ui_manager_) @@ -663,7 +671,8 @@ void BrowserProcessImpl::CreateIOThread() { background_x11_thread_.swap(background_x11_thread); #endif - scoped_ptr<IOThread> thread(new IOThread(local_state(), net_log_.get())); + scoped_ptr<IOThread> thread(new IOThread( + local_state(), net_log_.get(), extension_event_router_forwarder_.get())); base::Thread::Options options; options.message_loop_type = MessageLoop::TYPE_IO; if (!thread->StartWithOptions(options)) |