Index: ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h |
diff --git a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h |
index 24a909911c15f3845ccfeb413921fa8abe3dee6d..c1eb5515ef88124b8657646d17060a5f8d7a5a6c 100644 |
--- a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h |
+++ b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h |
@@ -67,7 +67,7 @@ class X11WholeScreenMoveLoop : public X11MoveLoop, |
// Are we running a nested message loop from RunMoveLoop()? |
bool in_move_loop_; |
- scoped_ptr<ui::ScopedEventDispatcher> nested_dispatcher_; |
+ std::unique_ptr<ui::ScopedEventDispatcher> nested_dispatcher_; |
// Cursor in use prior to the move loop starting. Restored when the move loop |
// quits. |
@@ -88,7 +88,7 @@ class X11WholeScreenMoveLoop : public X11MoveLoop, |
// pressing escape). |
bool canceled_; |
- scoped_ptr<ui::MouseEvent> last_motion_in_screen_; |
+ std::unique_ptr<ui::MouseEvent> last_motion_in_screen_; |
base::WeakPtrFactory<X11WholeScreenMoveLoop> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(X11WholeScreenMoveLoop); |