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

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

Issue 2081253002: Implement rudimentary touchscreen support in mus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing pure virtual. Created 4 years, 6 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
« no previous file with comments | « no previous file | components/mus/mus_app.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <map>
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "components/mus/input_devices/input_device_server.h" 17 #include "components/mus/input_devices/input_device_server.h"
18 #include "components/mus/public/interfaces/clipboard.mojom.h" 18 #include "components/mus/public/interfaces/clipboard.mojom.h"
19 #include "components/mus/public/interfaces/display.mojom.h" 19 #include "components/mus/public/interfaces/display.mojom.h"
20 #include "components/mus/public/interfaces/gpu.mojom.h" 20 #include "components/mus/public/interfaces/gpu.mojom.h"
21 #include "components/mus/public/interfaces/gpu_service.mojom.h" 21 #include "components/mus/public/interfaces/gpu_service.mojom.h"
22 #include "components/mus/public/interfaces/user_access_manager.mojom.h" 22 #include "components/mus/public/interfaces/user_access_manager.mojom.h"
23 #include "components/mus/public/interfaces/window_manager_window_tree_factory.mo jom.h" 23 #include "components/mus/public/interfaces/window_manager_window_tree_factory.mo jom.h"
24 #include "components/mus/public/interfaces/window_server_test.mojom.h" 24 #include "components/mus/public/interfaces/window_server_test.mojom.h"
25 #include "components/mus/public/interfaces/window_tree.mojom.h" 25 #include "components/mus/public/interfaces/window_tree.mojom.h"
26 #include "components/mus/public/interfaces/window_tree_host.mojom.h" 26 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
27 #include "components/mus/ws/platform_display_init_params.h" 27 #include "components/mus/ws/platform_display_init_params.h"
28 #include "components/mus/ws/touch_controller.h"
28 #include "components/mus/ws/user_id.h" 29 #include "components/mus/ws/user_id.h"
29 #include "components/mus/ws/window_server_delegate.h" 30 #include "components/mus/ws/window_server_delegate.h"
30 #include "services/shell/public/cpp/application_runner.h" 31 #include "services/shell/public/cpp/application_runner.h"
31 #include "services/shell/public/cpp/interface_factory.h" 32 #include "services/shell/public/cpp/interface_factory.h"
32 #include "services/shell/public/cpp/shell_client.h" 33 #include "services/shell/public/cpp/shell_client.h"
33 #include "services/tracing/public/cpp/tracing_impl.h" 34 #include "services/tracing/public/cpp/tracing_impl.h"
34 35
35 #if defined(USE_OZONE) 36 #if defined(USE_OZONE)
36 #include "ui/ozone/public/client_native_pixmap_factory.h" 37 #include "ui/ozone/public/client_native_pixmap_factory.h"
37 #endif 38 #endif
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 // Provides input-device information via Mojo IPC. 157 // Provides input-device information via Mojo IPC.
157 InputDeviceServer input_device_server_; 158 InputDeviceServer input_device_server_;
158 159
159 bool test_config_; 160 bool test_config_;
160 bool use_chrome_gpu_command_buffer_; 161 bool use_chrome_gpu_command_buffer_;
161 #if defined(USE_OZONE) 162 #if defined(USE_OZONE)
162 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; 163 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
163 #endif 164 #endif
164 165
165 std::unique_ptr<ws::PlatformScreen> platform_screen_; 166 std::unique_ptr<ws::PlatformScreen> platform_screen_;
167 std::unique_ptr<ws::TouchController> touch_controller_;
166 168
167 base::WeakPtrFactory<MusApp> weak_ptr_factory_; 169 base::WeakPtrFactory<MusApp> weak_ptr_factory_;
168 170
169 DISALLOW_COPY_AND_ASSIGN(MusApp); 171 DISALLOW_COPY_AND_ASSIGN(MusApp);
170 }; 172 };
171 173
172 } // namespace mus 174 } // namespace mus
173 175
174 #endif // COMPONENTS_MUS_MUS_APP_H_ 176 #endif // COMPONENTS_MUS_MUS_APP_H_
OLDNEW
« no previous file with comments | « no previous file | components/mus/mus_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698