Index: ui/display/chromeos/x11/native_display_event_dispatcher_x11.cc |
diff --git a/ui/display/chromeos/x11/native_display_event_dispatcher_x11.cc b/ui/display/chromeos/x11/native_display_event_dispatcher_x11.cc |
index 9e206ac7e3e4afba1c62750601fb8190a70d42b0..543e27e7f9e396dfe2622ce0e0da02c0a362929d 100644 |
--- a/ui/display/chromeos/x11/native_display_event_dispatcher_x11.cc |
+++ b/ui/display/chromeos/x11/native_display_event_dispatcher_x11.cc |
@@ -2,14 +2,16 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/time/default_tick_clock.h" |
#include "ui/display/chromeos/x11/native_display_event_dispatcher_x11.h" |
+ |
+#include <X11/extensions/Xrandr.h> |
+#include <utility> |
+ |
+#include "base/time/default_tick_clock.h" |
#include "ui/display/chromeos/x11/display_mode_x11.h" |
#include "ui/display/chromeos/x11/display_snapshot_x11.h" |
#include "ui/events/platform/platform_event_source.h" |
-#include <X11/extensions/Xrandr.h> |
- |
namespace ui { |
// static |
@@ -108,7 +110,7 @@ uint32_t NativeDisplayEventDispatcherX11::DispatchEvent( |
void NativeDisplayEventDispatcherX11::SetTickClockForTest( |
scoped_ptr<base::TickClock> tick_clock) { |
- tick_clock_ = tick_clock.Pass(); |
+ tick_clock_ = std::move(tick_clock); |
startup_time_ = tick_clock_->NowTicks(); |
} |