Chromium Code Reviews| Index: chrome/browser/extensions/api/automation_internal/automation_internal_api.cc |
| diff --git a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc |
| index 5e24a8b674b02c28276e127cc2da2d585ce2db09..01b1690594133e299406e554f3e8ab80b8f7e98a 100644 |
| --- a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc |
| +++ b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc |
| @@ -25,7 +25,6 @@ |
| #include "content/public/browser/render_widget_host_view.h" |
| #include "content/public/browser/web_contents.h" |
| #include "extensions/browser/event_router.h" |
| -#include "extensions/browser/extension_system.h" |
| #include "ui/accessibility/ax_enums.h" |
| #include "ui/accessibility/ax_node_data.h" |
| @@ -45,11 +44,15 @@ namespace { |
| void DispatchEvent(content::BrowserContext* context, |
| const std::string& event_name, |
| scoped_ptr<base::ListValue> args) { |
| - if (context && extensions::ExtensionSystem::Get(context)->event_router()) { |
| - scoped_ptr<Event> event(new Event(event_name, args.Pass())); |
| - event->restrict_to_browser_context = context; |
| - ExtensionSystem::Get(context)->event_router()->BroadcastEvent(event.Pass()); |
| - } |
| + if (!context) |
|
not at google - send to devlin
2014/04/17 16:09:46
the context can't possibly be null here, so you do
limasdf
2014/04/17 16:22:56
Done.
|
| + return; |
| + extensions::EventRouter* event_router = extensions::EventRouter::Get(context); |
| + if (!event_router) |
| + return; |
| + |
| + scoped_ptr<Event> event(new Event(event_name, args.Pass())); |
| + event->restrict_to_browser_context = context; |
| + event_router->BroadcastEvent(event.Pass()); |
| } |
| } // namespace |