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 c57463fd22d9dbdeaa7004b125bfbf0c8c18ff44..49463f03de24db13c42c5e8a653c2c2297707ce1 100644 |
--- a/chrome/browser/extensions/api/tabs/windows_event_router.cc |
+++ b/chrome/browser/extensions/api/tabs/windows_event_router.cc |
@@ -4,6 +4,8 @@ |
#include "chrome/browser/extensions/api/tabs/windows_event_router.h" |
+#include <utility> |
+ |
#include "base/values.h" |
#include "build/build_config.h" |
#include "chrome/browser/chrome_notification_types.h" |
@@ -197,7 +199,7 @@ void WindowsEventRouter::OnWindowControllerAdded( |
window_controller->CreateWindowValue(); |
args->Append(window_dictionary); |
DispatchEvent(events::WINDOWS_ON_CREATED, windows::OnCreated::kEventName, |
- window_controller, args.Pass()); |
+ window_controller, std::move(args)); |
} |
void WindowsEventRouter::OnWindowControllerRemoved( |
@@ -211,7 +213,7 @@ void WindowsEventRouter::OnWindowControllerRemoved( |
scoped_ptr<base::ListValue> args(new base::ListValue()); |
args->Append(new base::FundamentalValue(window_id)); |
DispatchEvent(events::WINDOWS_ON_REMOVED, windows::OnRemoved::kEventName, |
- window_controller, args.Pass()); |
+ window_controller, std::move(args)); |
} |
#if !defined(OS_MACOSX) |
@@ -259,18 +261,19 @@ void WindowsEventRouter::OnActiveWindowChanged( |
make_scoped_ptr(new base::ListValue()))); |
event->will_dispatch_callback = |
base::Bind(&WillDispatchWindowFocusedEvent, window_controller); |
- EventRouter::Get(profile_)->BroadcastEvent(event.Pass()); |
+ EventRouter::Get(profile_)->BroadcastEvent(std::move(event)); |
} |
void WindowsEventRouter::DispatchEvent(events::HistogramValue histogram_value, |
const std::string& event_name, |
WindowController* window_controller, |
scoped_ptr<base::ListValue> args) { |
- scoped_ptr<Event> event(new Event(histogram_value, event_name, args.Pass())); |
+ scoped_ptr<Event> event( |
+ new Event(histogram_value, event_name, std::move(args))); |
event->restrict_to_browser_context = window_controller->profile(); |
event->will_dispatch_callback = |
base::Bind(&WillDispatchWindowEvent, window_controller); |
- EventRouter::Get(profile_)->BroadcastEvent(event.Pass()); |
+ EventRouter::Get(profile_)->BroadcastEvent(std::move(event)); |
} |
bool WindowsEventRouter::HasEventListener(const std::string& event_name) { |
@@ -280,7 +283,7 @@ bool WindowsEventRouter::HasEventListener(const std::string& event_name) { |
void WindowsEventRouter::AddAppWindow(extensions::AppWindow* app_window) { |
scoped_ptr<AppWindowController> controller(new AppWindowController( |
app_window, make_scoped_ptr(new AppBaseWindow(app_window)), profile_)); |
- app_windows_[app_window->session_id().id()] = controller.Pass(); |
+ app_windows_[app_window->session_id().id()] = std::move(controller); |
} |
} // namespace extensions |