| 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 15 matching lines...) Expand all Loading... |
| 26 namespace aura { | 26 namespace aura { |
| 27 namespace client { | 27 namespace client { |
| 28 class DefaultCaptureClient; | 28 class DefaultCaptureClient; |
| 29 class ScreenPositionClient; | 29 class ScreenPositionClient; |
| 30 class WindowTreeClient; | 30 class WindowTreeClient; |
| 31 } | 31 } |
| 32 class Window; | 32 class Window; |
| 33 } | 33 } |
| 34 | 34 |
| 35 namespace ui { | 35 namespace ui { |
| 36 class BitmapUploader; | |
| 37 class Window; | 36 class Window; |
| 38 class WindowTreeClient; | 37 class WindowTreeClient; |
| 39 namespace mojom { | 38 namespace mojom { |
| 40 enum class Cursor; | 39 enum class Cursor; |
| 41 enum class EventResult; | 40 enum class EventResult; |
| 42 } | 41 } |
| 43 } | 42 } |
| 44 | 43 |
| 45 namespace shell { | 44 namespace shell { |
| 46 class Connector; | 45 class Connector; |
| 47 } | 46 } |
| 48 | 47 |
| 49 namespace ui { | 48 namespace ui { |
| 50 class Event; | 49 class Event; |
| 51 class ViewProp; | |
| 52 } | 50 } |
| 53 | 51 |
| 54 namespace wm { | 52 namespace wm { |
| 55 class CursorManager; | 53 class CursorManager; |
| 56 class FocusController; | 54 class FocusController; |
| 57 } | 55 } |
| 58 | 56 |
| 59 namespace views { | 57 namespace views { |
| 60 class SurfaceContextFactory; | 58 class SurfaceContextFactory; |
| 61 class WidgetDelegate; | 59 class WidgetDelegate; |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 // Aura configuration. | 271 // Aura configuration. |
| 274 std::unique_ptr<SurfaceContextFactory> context_factory_; | 272 std::unique_ptr<SurfaceContextFactory> context_factory_; |
| 275 std::unique_ptr<WindowTreeHostMus> window_tree_host_; | 273 std::unique_ptr<WindowTreeHostMus> window_tree_host_; |
| 276 aura::Window* content_; | 274 aura::Window* content_; |
| 277 std::unique_ptr<wm::FocusController> focus_client_; | 275 std::unique_ptr<wm::FocusController> focus_client_; |
| 278 std::unique_ptr<MusCaptureClient> capture_client_; | 276 std::unique_ptr<MusCaptureClient> capture_client_; |
| 279 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; | 277 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; |
| 280 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; | 278 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; |
| 281 std::unique_ptr<wm::CursorManager> cursor_manager_; | 279 std::unique_ptr<wm::CursorManager> cursor_manager_; |
| 282 | 280 |
| 283 // Bitmap management. | |
| 284 std::unique_ptr<ui::BitmapUploader> bitmap_uploader_; | |
| 285 std::unique_ptr<ui::ViewProp> prop_; | |
| 286 | |
| 287 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; | 281 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; |
| 288 | 282 |
| 289 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); | 283 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); |
| 290 }; | 284 }; |
| 291 | 285 |
| 292 } // namespace views | 286 } // namespace views |
| 293 | 287 |
| 294 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ | 288 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ |
| OLD | NEW |