| Index: chrome/browser/extensions/event_router_forwarder.cc
|
| diff --git a/chrome/browser/extensions/event_router_forwarder.cc b/chrome/browser/extensions/event_router_forwarder.cc
|
| index adeb033c775ed46611b6cb6c1be01fd90e45aae1..e14471ff571aa0f050e78012fd722ea312872f1e 100644
|
| --- a/chrome/browser/extensions/event_router_forwarder.cc
|
| +++ b/chrome/browser/extensions/event_router_forwarder.cc
|
| @@ -8,6 +8,7 @@
|
| #include "base/values.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/extensions/event_router.h"
|
| +#include "chrome/browser/extensions/extension_system.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "googleurl/src/gurl.h"
|
|
|
| @@ -108,16 +109,16 @@ void EventRouterForwarder::CallEventRouter(Profile* profile,
|
| // We may not have an extension in cases like chromeos login
|
| // (crosbug.com/12856), chrome_frame_net_tests.exe which reuses the chrome
|
| // browser single process framework.
|
| - if (!profile->GetExtensionEventRouter())
|
| + if (!extensions::ExtensionSystem::Get(profile)->event_router())
|
| return;
|
|
|
| if (extension_id.empty()) {
|
| - profile->GetExtensionEventRouter()->
|
| + extensions::ExtensionSystem::Get(profile)->event_router()->
|
| DispatchEventToRenderers(
|
| event_name, event_args.Pass(), restrict_to_profile, event_url,
|
| EventFilteringInfo());
|
| } else {
|
| - profile->GetExtensionEventRouter()->
|
| + extensions::ExtensionSystem::Get(profile)->event_router()->
|
| DispatchEventToExtension(
|
| extension_id,
|
| event_name, event_args.Pass(), restrict_to_profile, event_url);
|
|
|