chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc - Issue 238633009: cleanup: Use EventRouter instead of ExtensionSystem::Get->event_router()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc

Issue 238633009: cleanup: Use EventRouter instead of ExtensionSystem::Get->event_router() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/api/automation_internal/automation_internal_api.cc ('K') | « chrome/browser/extensions/api/bluetooth/bluetooth_api_unittest.cc ('k') | chrome/browser/extensions/api/bluetooth/bluetooth_private_api.cc » ('j') | chrome/browser/extensions/api/media_galleries/media_galleries_api.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc

diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc

index a440c49237d68793621224824d455a293c2504af..31a26c13e8b174b1a32614fb96229cc3c91c3acc 100644

--- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc

+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc

@@ -31,7 +31,6 @@

#include "device/bluetooth/bluetooth_socket.h"

#include "extensions/browser/event_router.h"

#include "extensions/browser/extension_host.h"

-#include "extensions/browser/extension_system.h"

namespace extensions {

@@ -336,8 +335,7 @@ void BluetoothEventRouter::DispatchAdapterStateEvent() {

scoped_ptr<Event> event(new Event(

bluetooth::OnAdapterStateChanged::kEventName,

args.Pass()));

- ExtensionSystem::Get(browser_context_)->event_router()->BroadcastEvent(

- event.Pass());

+ EventRouter::Get(browser_context_)->BroadcastEvent(event.Pass());

}

void BluetoothEventRouter::DispatchDeviceEvent(

@@ -349,8 +347,7 @@ void BluetoothEventRouter::DispatchDeviceEvent(

scoped_ptr<base::ListValue> args =

bluetooth::OnDeviceAdded::Create(extension_device);

scoped_ptr<Event> event(new Event(event_name, args.Pass()));

- ExtensionSystem::Get(browser_context_)->event_router()->BroadcastEvent(

- event.Pass());

+ EventRouter::Get(browser_context_)->BroadcastEvent(event.Pass());

}

void BluetoothEventRouter::CleanUpForExtension(