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 25 matching lines...) Expand all Loading... |
36 class Window; | 36 class Window; |
37 class WindowTreeClient; | 37 class WindowTreeClient; |
38 namespace mojom { | 38 namespace mojom { |
39 enum class Cursor; | 39 enum class Cursor; |
40 enum class EventResult; | 40 enum class EventResult; |
41 } | 41 } |
42 } | 42 } |
43 | 43 |
44 namespace ui { | 44 namespace ui { |
45 class Event; | 45 class Event; |
| 46 class ViewProp; |
46 } | 47 } |
47 | 48 |
48 namespace wm { | 49 namespace wm { |
49 class CursorManager; | 50 class CursorManager; |
50 class FocusController; | 51 class FocusController; |
51 } | 52 } |
52 | 53 |
53 namespace views { | 54 namespace views { |
54 class SurfaceContextFactory; | 55 class SurfaceContextFactory; |
55 class WidgetDelegate; | 56 class WidgetDelegate; |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
265 | 266 |
266 // Aura configuration. | 267 // Aura configuration. |
267 std::unique_ptr<SurfaceContextFactory> context_factory_; | 268 std::unique_ptr<SurfaceContextFactory> context_factory_; |
268 std::unique_ptr<WindowTreeHostMus> window_tree_host_; | 269 std::unique_ptr<WindowTreeHostMus> window_tree_host_; |
269 aura::Window* content_; | 270 aura::Window* content_; |
270 std::unique_ptr<wm::FocusController> focus_client_; | 271 std::unique_ptr<wm::FocusController> focus_client_; |
271 std::unique_ptr<MusCaptureClient> capture_client_; | 272 std::unique_ptr<MusCaptureClient> capture_client_; |
272 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; | 273 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; |
273 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; | 274 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; |
274 std::unique_ptr<wm::CursorManager> cursor_manager_; | 275 std::unique_ptr<wm::CursorManager> cursor_manager_; |
| 276 std::unique_ptr<ui::ViewProp> prop_; |
275 | 277 |
276 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; | 278 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; |
277 | 279 |
278 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); | 280 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); |
279 }; | 281 }; |
280 | 282 |
281 } // namespace views | 283 } // namespace views |
282 | 284 |
283 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ | 285 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ |
OLD | NEW |