Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Side by Side Diff: components/mus/mus_app.h

Issue 1992443002: Add Mojo IPC based input-device service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_ddm
Patch Set: Clean up/move files. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/input_device_service/input_device_server.h"
16 #include "components/mus/public/interfaces/display.mojom.h" 18 #include "components/mus/public/interfaces/display.mojom.h"
17 #include "components/mus/public/interfaces/gpu.mojom.h" 19 #include "components/mus/public/interfaces/gpu.mojom.h"
18 #include "components/mus/public/interfaces/user_access_manager.mojom.h" 20 #include "components/mus/public/interfaces/user_access_manager.mojom.h"
19 #include "components/mus/public/interfaces/window_manager_factory.mojom.h" 21 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
20 #include "components/mus/public/interfaces/window_server_test.mojom.h" 22 #include "components/mus/public/interfaces/window_server_test.mojom.h"
21 #include "components/mus/public/interfaces/window_tree.mojom.h" 23 #include "components/mus/public/interfaces/window_tree.mojom.h"
22 #include "components/mus/public/interfaces/window_tree_host.mojom.h" 24 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
23 #include "components/mus/ws/platform_display_init_params.h" 25 #include "components/mus/ws/platform_display_init_params.h"
24 #include "components/mus/ws/user_id.h" 26 #include "components/mus/ws/user_id.h"
25 #include "components/mus/ws/window_server_delegate.h" 27 #include "components/mus/ws/window_server_delegate.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 133
132 ws::PlatformDisplayInitParams platform_display_init_params_; 134 ws::PlatformDisplayInitParams platform_display_init_params_;
133 std::unique_ptr<ws::WindowServer> window_server_; 135 std::unique_ptr<ws::WindowServer> window_server_;
134 std::unique_ptr<ui::PlatformEventSource> event_source_; 136 std::unique_ptr<ui::PlatformEventSource> event_source_;
135 mojo::TracingImpl tracing_; 137 mojo::TracingImpl tracing_;
136 using PendingRequests = std::vector<std::unique_ptr<PendingRequest>>; 138 using PendingRequests = std::vector<std::unique_ptr<PendingRequest>>;
137 PendingRequests pending_requests_; 139 PendingRequests pending_requests_;
138 140
139 UserIdToUserState user_id_to_user_state_; 141 UserIdToUserState user_id_to_user_state_;
140 142
143 input_device::InputDeviceServer input_device_server_;
144
141 bool test_config_; 145 bool test_config_;
142 #if defined(USE_OZONE) 146 #if defined(USE_OZONE)
143 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; 147 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
144 #endif 148 #endif
145 149
146 std::unique_ptr<ws::PlatformScreen> platform_screen_; 150 std::unique_ptr<ws::PlatformScreen> platform_screen_;
147 151
148 base::WeakPtrFactory<MusApp> weak_ptr_factory_; 152 base::WeakPtrFactory<MusApp> weak_ptr_factory_;
149 153
150 DISALLOW_COPY_AND_ASSIGN(MusApp); 154 DISALLOW_COPY_AND_ASSIGN(MusApp);
151 }; 155 };
152 156
153 } // namespace mus 157 } // namespace mus
154 158
155 #endif // COMPONENTS_MUS_MUS_APP_H_ 159 #endif // COMPONENTS_MUS_MUS_APP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698