| Index: ui/events/ozone/evdev/event_thread_evdev.cc
|
| diff --git a/ui/events/ozone/evdev/event_thread_evdev.cc b/ui/events/ozone/evdev/event_thread_evdev.cc
|
| index 66ce4c28165eba668365540b1fde344ca8753166..7257718fa358bf163a71897be13f1947f7927f54 100644
|
| --- a/ui/events/ozone/evdev/event_thread_evdev.cc
|
| +++ b/ui/events/ozone/evdev/event_thread_evdev.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ui/events/ozone/evdev/event_thread_evdev.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/callback.h"
|
| #include "base/logging.h"
|
| @@ -25,7 +27,7 @@ class EvdevThread : public base::Thread {
|
| CursorDelegateEvdev* cursor,
|
| const EventThreadStartCallback& callback)
|
| : base::Thread("evdev"),
|
| - dispatcher_(dispatcher.Pass()),
|
| + dispatcher_(std::move(dispatcher)),
|
| cursor_(cursor),
|
| init_callback_(callback),
|
| init_runner_(base::ThreadTaskRunnerHandle::Get()) {}
|
| @@ -34,7 +36,7 @@ class EvdevThread : public base::Thread {
|
| void Init() override {
|
| TRACE_EVENT0("evdev", "EvdevThread::Init");
|
| input_device_factory_ =
|
| - new InputDeviceFactoryEvdev(dispatcher_.Pass(), cursor_);
|
| + new InputDeviceFactoryEvdev(std::move(dispatcher_), cursor_);
|
|
|
| scoped_ptr<InputDeviceFactoryEvdevProxy> proxy(
|
| new InputDeviceFactoryEvdevProxy(base::ThreadTaskRunnerHandle::Get(),
|
| @@ -72,7 +74,7 @@ void EventThreadEvdev::Start(scoped_ptr<DeviceEventDispatcherEvdev> dispatcher,
|
| CursorDelegateEvdev* cursor,
|
| const EventThreadStartCallback& callback) {
|
| TRACE_EVENT0("evdev", "EventThreadEvdev::Start");
|
| - thread_.reset(new EvdevThread(dispatcher.Pass(), cursor, callback));
|
| + thread_.reset(new EvdevThread(std::move(dispatcher), cursor, callback));
|
| if (!thread_->StartWithOptions(
|
| base::Thread::Options(base::MessageLoop::TYPE_UI, 0)))
|
| LOG(FATAL) << "Failed to create input thread";
|
|
|