OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef MASH_WM_FRAME_MOVE_EVENT_HANDLER_H_ | 5 #ifndef MASH_WM_FRAME_MOVE_EVENT_HANDLER_H_ |
6 #define MASH_WM_FRAME_MOVE_EVENT_HANDLER_H_ | 6 #define MASH_WM_FRAME_MOVE_EVENT_HANDLER_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "ui/aura/window_observer.h" | 11 #include "ui/aura/window_observer.h" |
11 #include "ui/events/event_handler.h" | 12 #include "ui/events/event_handler.h" |
12 | 13 |
13 namespace aura { | 14 namespace aura { |
14 class Window; | 15 class Window; |
15 } | 16 } |
16 | 17 |
17 namespace mus { | 18 namespace mus { |
18 class Window; | 19 class Window; |
19 } | 20 } |
(...skipping 24 matching lines...) Expand all Loading... |
44 void OnMouseEvent(ui::MouseEvent* event) override; | 45 void OnMouseEvent(ui::MouseEvent* event) override; |
45 void OnTouchEvent(ui::TouchEvent* event) override; | 46 void OnTouchEvent(ui::TouchEvent* event) override; |
46 void OnCancelMode(ui::CancelModeEvent* event) override; | 47 void OnCancelMode(ui::CancelModeEvent* event) override; |
47 | 48 |
48 // Overridden from aura::WindowObserver: | 49 // Overridden from aura::WindowObserver: |
49 void OnWindowDestroying(aura::Window* window) override; | 50 void OnWindowDestroying(aura::Window* window) override; |
50 | 51 |
51 mus::Window* mus_window_; | 52 mus::Window* mus_window_; |
52 aura::Window* aura_window_; | 53 aura::Window* aura_window_; |
53 aura::Window* root_window_; | 54 aura::Window* root_window_; |
54 scoped_ptr<MoveLoop> move_loop_; | 55 std::unique_ptr<MoveLoop> move_loop_; |
55 | 56 |
56 DISALLOW_COPY_AND_ASSIGN(MoveEventHandler); | 57 DISALLOW_COPY_AND_ASSIGN(MoveEventHandler); |
57 }; | 58 }; |
58 | 59 |
59 } // namespace wm | 60 } // namespace wm |
60 } // namespace mash | 61 } // namespace mash |
61 | 62 |
62 #endif // MASH_WM_FRAME_MOVE_EVENT_HANDLER_H_ | 63 #endif // MASH_WM_FRAME_MOVE_EVENT_HANDLER_H_ |
OLD | NEW |