Index: chrome/browser/extensions/api/tabs/windows_event_router.cc |
diff --git a/chrome/browser/extensions/api/tabs/windows_event_router.cc b/chrome/browser/extensions/api/tabs/windows_event_router.cc |
index 82697203cc40373309d52f4cca3cd8bdb50644b2..d1372526e10894dd72c88c0090b9400232e04a24 100644 |
--- a/chrome/browser/extensions/api/tabs/windows_event_router.cc |
+++ b/chrome/browser/extensions/api/tabs/windows_event_router.cc |
@@ -252,9 +252,9 @@ void WindowsEventRouter::OnActiveWindowChanged( |
if (!HasEventListener(windows::OnFocusChanged::kEventName)) |
return; |
- std::unique_ptr<Event> event(new Event( |
- events::WINDOWS_ON_FOCUS_CHANGED, windows::OnFocusChanged::kEventName, |
- base::WrapUnique(new base::ListValue()))); |
+ std::unique_ptr<Event> event(new Event(events::WINDOWS_ON_FOCUS_CHANGED, |
Devlin
2016/08/29 15:10:01
MakeUnique
Adam Rice
2016/08/30 07:03:00
Done.
|
+ windows::OnFocusChanged::kEventName, |
+ base::MakeUnique<base::ListValue>())); |
event->will_dispatch_callback = |
base::Bind(&WillDispatchWindowFocusedEvent, window_controller); |
EventRouter::Get(profile_)->BroadcastEvent(std::move(event)); |
@@ -278,7 +278,7 @@ bool WindowsEventRouter::HasEventListener(const std::string& event_name) { |
void WindowsEventRouter::AddAppWindow(extensions::AppWindow* app_window) { |
std::unique_ptr<AppWindowController> controller(new AppWindowController( |
- app_window, base::WrapUnique(new AppBaseWindow(app_window)), profile_)); |
+ app_window, base::MakeUnique<AppBaseWindow>(app_window), profile_)); |
app_windows_[app_window->session_id().id()] = std::move(controller); |
} |