| 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 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 const mus::mojom::SurfaceType surface_type_; | 257 const mus::mojom::SurfaceType surface_type_; |
| 258 mus::mojom::ShowState show_state_before_fullscreen_; | 258 mus::mojom::ShowState show_state_before_fullscreen_; |
| 259 | 259 |
| 260 // See class documentation for Widget in widget.h for a note about ownership. | 260 // See class documentation for Widget in widget.h for a note about ownership. |
| 261 Widget::InitParams::Ownership ownership_; | 261 Widget::InitParams::Ownership ownership_; |
| 262 | 262 |
| 263 // Functions with the same name require the mus::WindowObserver to be in | 263 // Functions with the same name require the mus::WindowObserver to be in |
| 264 // a separate class. | 264 // a separate class. |
| 265 std::unique_ptr<MusWindowObserver> mus_window_observer_; | 265 std::unique_ptr<MusWindowObserver> mus_window_observer_; |
| 266 | 266 |
| 267 // This is misnamed; The native widget interface offers something called |
| 268 // "native window properties" which are properties which it stores locally, |
| 269 // and this is used to unsafely pass void* pointers around chrome. |
| 270 std::map<std::string, void*> native_window_properties_; |
| 271 |
| 267 // Aura configuration. | 272 // Aura configuration. |
| 268 std::unique_ptr<SurfaceContextFactory> context_factory_; | 273 std::unique_ptr<SurfaceContextFactory> context_factory_; |
| 269 std::unique_ptr<WindowTreeHostMus> window_tree_host_; | 274 std::unique_ptr<WindowTreeHostMus> window_tree_host_; |
| 270 aura::Window* content_; | 275 aura::Window* content_; |
| 271 std::unique_ptr<wm::FocusController> focus_client_; | 276 std::unique_ptr<wm::FocusController> focus_client_; |
| 272 std::unique_ptr<MusCaptureClient> capture_client_; | 277 std::unique_ptr<MusCaptureClient> capture_client_; |
| 273 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; | 278 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; |
| 274 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; | 279 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; |
| 275 std::unique_ptr<wm::CursorManager> cursor_manager_; | 280 std::unique_ptr<wm::CursorManager> cursor_manager_; |
| 276 | 281 |
| 277 // Bitmap management. | 282 // Bitmap management. |
| 278 std::unique_ptr<bitmap_uploader::BitmapUploader> bitmap_uploader_; | 283 std::unique_ptr<bitmap_uploader::BitmapUploader> bitmap_uploader_; |
| 279 std::unique_ptr<ui::ViewProp> prop_; | 284 std::unique_ptr<ui::ViewProp> prop_; |
| 280 | 285 |
| 281 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; | 286 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; |
| 282 | 287 |
| 283 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); | 288 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); |
| 284 }; | 289 }; |
| 285 | 290 |
| 286 } // namespace views | 291 } // namespace views |
| 287 | 292 |
| 288 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ | 293 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ |
| OLD | NEW |