| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 SERVICES_UI_WS_WINDOW_SERVER_H_ | 5 #ifndef SERVICES_UI_WS_WINDOW_SERVER_H_ |
| 6 #define SERVICES_UI_WS_WINDOW_SERVER_H_ | 6 #define SERVICES_UI_WS_WINDOW_SERVER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 base::Callback<void(ServerWindow*)> window_paint_callback_; | 370 base::Callback<void(ServerWindow*)> window_paint_callback_; |
| 371 | 371 |
| 372 UserActivityMonitorMap activity_monitor_map_; | 372 UserActivityMonitorMap activity_monitor_map_; |
| 373 | 373 |
| 374 WindowManagerWindowTreeFactorySet window_manager_window_tree_factory_set_; | 374 WindowManagerWindowTreeFactorySet window_manager_window_tree_factory_set_; |
| 375 | 375 |
| 376 mojo::Binding<cc::mojom::DisplayCompositorClient> | 376 mojo::Binding<cc::mojom::DisplayCompositorClient> |
| 377 display_compositor_client_binding_; | 377 display_compositor_client_binding_; |
| 378 // State for rendering into a Surface. | 378 // State for rendering into a Surface. |
| 379 cc::mojom::DisplayCompositorPtr display_compositor_; | 379 cc::mojom::DisplayCompositorPtr display_compositor_; |
| 380 cc::mojom::DisplayCompositorRequest display_compositor_request_; | |
| 381 | 380 |
| 382 DISALLOW_COPY_AND_ASSIGN(WindowServer); | 381 DISALLOW_COPY_AND_ASSIGN(WindowServer); |
| 383 }; | 382 }; |
| 384 | 383 |
| 385 } // namespace ws | 384 } // namespace ws |
| 386 } // namespace ui | 385 } // namespace ui |
| 387 | 386 |
| 388 #endif // SERVICES_UI_WS_WINDOW_SERVER_H_ | 387 #endif // SERVICES_UI_WS_WINDOW_SERVER_H_ |
| OLD | NEW |