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 UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ | 5 #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ |
6 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ | 6 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
(...skipping 21 matching lines...) Expand all Loading... |
32 namespace mus { | 32 namespace mus { |
33 class Window; | 33 class Window; |
34 class WindowTreeConnection; | 34 class WindowTreeConnection; |
35 } | 35 } |
36 | 36 |
37 namespace shell { | 37 namespace shell { |
38 class Connector; | 38 class Connector; |
39 } | 39 } |
40 | 40 |
41 namespace wm { | 41 namespace wm { |
| 42 class CursorManager; |
42 class FocusController; | 43 class FocusController; |
43 } | 44 } |
44 | 45 |
45 namespace views { | 46 namespace views { |
46 class SurfaceContextFactory; | 47 class SurfaceContextFactory; |
47 class WidgetDelegate; | 48 class WidgetDelegate; |
48 class WindowTreeHostMus; | 49 class WindowTreeHostMus; |
49 | 50 |
50 // An implementation of NativeWidget that binds to a mus::Window. Because Aura | 51 // An implementation of NativeWidget that binds to a mus::Window. Because Aura |
51 // is used extensively within Views code, this code uses aura and binds to the | 52 // is used extensively within Views code, this code uses aura and binds to the |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 std::unique_ptr<MusWindowObserver> mus_window_observer_; | 223 std::unique_ptr<MusWindowObserver> mus_window_observer_; |
223 | 224 |
224 // Aura configuration. | 225 // Aura configuration. |
225 std::unique_ptr<SurfaceContextFactory> context_factory_; | 226 std::unique_ptr<SurfaceContextFactory> context_factory_; |
226 std::unique_ptr<WindowTreeHostMus> window_tree_host_; | 227 std::unique_ptr<WindowTreeHostMus> window_tree_host_; |
227 aura::Window* content_; | 228 aura::Window* content_; |
228 std::unique_ptr<wm::FocusController> focus_client_; | 229 std::unique_ptr<wm::FocusController> focus_client_; |
229 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; | 230 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; |
230 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; | 231 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; |
231 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; | 232 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; |
| 233 std::unique_ptr<wm::CursorManager> cursor_manager_; |
232 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; | 234 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; |
233 | 235 |
234 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); | 236 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); |
235 }; | 237 }; |
236 | 238 |
237 } // namespace views | 239 } // namespace views |
238 | 240 |
239 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ | 241 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ |
OLD | NEW |