| 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 COMPONENTS_MUS_MUS_APP_H_ | 5 #ifndef COMPONENTS_MUS_MUS_APP_H_ |
| 6 #define COMPONENTS_MUS_MUS_APP_H_ | 6 #define COMPONENTS_MUS_MUS_APP_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> |
| 10 #include <memory> | 11 #include <memory> |
| 11 #include <string> | 12 #include <string> |
| 12 #include <vector> | 13 #include <vector> |
| 13 | 14 |
| 14 #include "base/macros.h" | 15 #include "base/macros.h" |
| 15 #include "base/memory/weak_ptr.h" | 16 #include "base/memory/weak_ptr.h" |
| 17 #include "components/mus/input_devices/input_device_server.h" |
| 16 #include "components/mus/public/interfaces/clipboard.mojom.h" | 18 #include "components/mus/public/interfaces/clipboard.mojom.h" |
| 17 #include "components/mus/public/interfaces/display.mojom.h" | 19 #include "components/mus/public/interfaces/display.mojom.h" |
| 18 #include "components/mus/public/interfaces/gpu.mojom.h" | 20 #include "components/mus/public/interfaces/gpu.mojom.h" |
| 19 #include "components/mus/public/interfaces/user_access_manager.mojom.h" | 21 #include "components/mus/public/interfaces/user_access_manager.mojom.h" |
| 20 #include "components/mus/public/interfaces/window_manager_factory.mojom.h" | 22 #include "components/mus/public/interfaces/window_manager_factory.mojom.h" |
| 21 #include "components/mus/public/interfaces/window_server_test.mojom.h" | 23 #include "components/mus/public/interfaces/window_server_test.mojom.h" |
| 22 #include "components/mus/public/interfaces/window_tree.mojom.h" | 24 #include "components/mus/public/interfaces/window_tree.mojom.h" |
| 23 #include "components/mus/public/interfaces/window_tree_host.mojom.h" | 25 #include "components/mus/public/interfaces/window_tree_host.mojom.h" |
| 24 #include "components/mus/ws/platform_display_init_params.h" | 26 #include "components/mus/ws/platform_display_init_params.h" |
| 25 #include "components/mus/ws/user_id.h" | 27 #include "components/mus/ws/user_id.h" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 | 139 |
| 138 ws::PlatformDisplayInitParams platform_display_init_params_; | 140 ws::PlatformDisplayInitParams platform_display_init_params_; |
| 139 std::unique_ptr<ws::WindowServer> window_server_; | 141 std::unique_ptr<ws::WindowServer> window_server_; |
| 140 std::unique_ptr<ui::PlatformEventSource> event_source_; | 142 std::unique_ptr<ui::PlatformEventSource> event_source_; |
| 141 mojo::TracingImpl tracing_; | 143 mojo::TracingImpl tracing_; |
| 142 using PendingRequests = std::vector<std::unique_ptr<PendingRequest>>; | 144 using PendingRequests = std::vector<std::unique_ptr<PendingRequest>>; |
| 143 PendingRequests pending_requests_; | 145 PendingRequests pending_requests_; |
| 144 | 146 |
| 145 UserIdToUserState user_id_to_user_state_; | 147 UserIdToUserState user_id_to_user_state_; |
| 146 | 148 |
| 149 input_device::InputDeviceServer input_device_server_; |
| 150 |
| 147 bool test_config_; | 151 bool test_config_; |
| 148 #if defined(USE_OZONE) | 152 #if defined(USE_OZONE) |
| 149 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; | 153 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; |
| 150 #endif | 154 #endif |
| 151 | 155 |
| 152 std::unique_ptr<ws::PlatformScreen> platform_screen_; | 156 std::unique_ptr<ws::PlatformScreen> platform_screen_; |
| 153 | 157 |
| 154 base::WeakPtrFactory<MusApp> weak_ptr_factory_; | 158 base::WeakPtrFactory<MusApp> weak_ptr_factory_; |
| 155 | 159 |
| 156 DISALLOW_COPY_AND_ASSIGN(MusApp); | 160 DISALLOW_COPY_AND_ASSIGN(MusApp); |
| 157 }; | 161 }; |
| 158 | 162 |
| 159 } // namespace mus | 163 } // namespace mus |
| 160 | 164 |
| 161 #endif // COMPONENTS_MUS_MUS_APP_H_ | 165 #endif // COMPONENTS_MUS_MUS_APP_H_ |
| OLD | NEW |