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

Side by Side Diff: services/ui/mus_app.h

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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 | « services/ui/manifest.json ('k') | services/ui/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 SERVICES_UI_MUS_APP_H_
6 #define COMPONENTS_MUS_MUS_APP_H_ 6 #define SERVICES_UI_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"
18 #include "components/mus/public/interfaces/clipboard.mojom.h"
19 #include "components/mus/public/interfaces/display.mojom.h"
20 #include "components/mus/public/interfaces/gpu.mojom.h"
21 #include "components/mus/public/interfaces/gpu_service.mojom.h"
22 #include "components/mus/public/interfaces/user_access_manager.mojom.h"
23 #include "components/mus/public/interfaces/user_activity_monitor.mojom.h"
24 #include "components/mus/public/interfaces/window_manager_window_tree_factory.mo jom.h"
25 #include "components/mus/public/interfaces/window_server_test.mojom.h"
26 #include "components/mus/public/interfaces/window_tree.mojom.h"
27 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
28 #include "components/mus/ws/platform_display_init_params.h"
29 #include "components/mus/ws/touch_controller.h"
30 #include "components/mus/ws/user_id.h"
31 #include "components/mus/ws/window_server_delegate.h"
32 #include "services/shell/public/cpp/application_runner.h" 17 #include "services/shell/public/cpp/application_runner.h"
33 #include "services/shell/public/cpp/interface_factory.h" 18 #include "services/shell/public/cpp/interface_factory.h"
34 #include "services/shell/public/cpp/shell_client.h" 19 #include "services/shell/public/cpp/shell_client.h"
35 #include "services/tracing/public/cpp/tracing_impl.h" 20 #include "services/tracing/public/cpp/tracing_impl.h"
21 #include "services/ui/input_devices/input_device_server.h"
22 #include "services/ui/public/interfaces/clipboard.mojom.h"
23 #include "services/ui/public/interfaces/display.mojom.h"
24 #include "services/ui/public/interfaces/gpu.mojom.h"
25 #include "services/ui/public/interfaces/gpu_service.mojom.h"
26 #include "services/ui/public/interfaces/user_access_manager.mojom.h"
27 #include "services/ui/public/interfaces/user_activity_monitor.mojom.h"
28 #include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom .h"
29 #include "services/ui/public/interfaces/window_server_test.mojom.h"
30 #include "services/ui/public/interfaces/window_tree.mojom.h"
31 #include "services/ui/public/interfaces/window_tree_host.mojom.h"
32 #include "services/ui/ws/platform_display_init_params.h"
33 #include "services/ui/ws/touch_controller.h"
34 #include "services/ui/ws/user_id.h"
35 #include "services/ui/ws/window_server_delegate.h"
36 36
37 #if defined(USE_OZONE) 37 #if defined(USE_OZONE)
38 #include "ui/ozone/public/client_native_pixmap_factory.h" 38 #include "ui/ozone/public/client_native_pixmap_factory.h"
39 #endif 39 #endif
40 40
41 namespace gfx { 41 namespace gfx {
42 class Rect; 42 class Rect;
43 } 43 }
44 44
45 namespace shell { 45 namespace shell {
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 std::unique_ptr<ws::PlatformScreen> platform_screen_; 172 std::unique_ptr<ws::PlatformScreen> platform_screen_;
173 std::unique_ptr<ws::TouchController> touch_controller_; 173 std::unique_ptr<ws::TouchController> touch_controller_;
174 174
175 base::WeakPtrFactory<MusApp> weak_ptr_factory_; 175 base::WeakPtrFactory<MusApp> weak_ptr_factory_;
176 176
177 DISALLOW_COPY_AND_ASSIGN(MusApp); 177 DISALLOW_COPY_AND_ASSIGN(MusApp);
178 }; 178 };
179 179
180 } // namespace mus 180 } // namespace mus
181 181
182 #endif // COMPONENTS_MUS_MUS_APP_H_ 182 #endif // SERVICES_UI_MUS_APP_H_
OLDNEW
« no previous file with comments | « services/ui/manifest.json ('k') | services/ui/mus_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698