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

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

Issue 1878893002: Move //mojo/services tracing & catalog to //services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@63move
Patch Set: . Created 4 years, 8 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 | « components/mus/DEPS ('k') | 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 <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "components/mus/public/interfaces/display.mojom.h" 15 #include "components/mus/public/interfaces/display.mojom.h"
16 #include "components/mus/public/interfaces/gpu.mojom.h" 16 #include "components/mus/public/interfaces/gpu.mojom.h"
17 #include "components/mus/public/interfaces/user_access_manager.mojom.h" 17 #include "components/mus/public/interfaces/user_access_manager.mojom.h"
18 #include "components/mus/public/interfaces/window_manager_factory.mojom.h" 18 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
19 #include "components/mus/public/interfaces/window_tree.mojom.h" 19 #include "components/mus/public/interfaces/window_tree.mojom.h"
20 #include "components/mus/public/interfaces/window_tree_host.mojom.h" 20 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
21 #include "components/mus/ws/platform_display_init_params.h" 21 #include "components/mus/ws/platform_display_init_params.h"
22 #include "components/mus/ws/user_id.h" 22 #include "components/mus/ws/user_id.h"
23 #include "components/mus/ws/window_server_delegate.h" 23 #include "components/mus/ws/window_server_delegate.h"
24 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
25 #include "services/shell/public/cpp/application_runner.h" 24 #include "services/shell/public/cpp/application_runner.h"
26 #include "services/shell/public/cpp/interface_factory.h" 25 #include "services/shell/public/cpp/interface_factory.h"
27 #include "services/shell/public/cpp/shell_client.h" 26 #include "services/shell/public/cpp/shell_client.h"
27 #include "services/tracing/public/cpp/tracing_impl.h"
28 28
29 namespace mojo { 29 namespace mojo {
30 class Connector; 30 class Connector;
31 } 31 }
32 32
33 namespace ui { 33 namespace ui {
34 class PlatformEventSource; 34 class PlatformEventSource;
35 } 35 }
36 36
37 namespace mus { 37 namespace mus {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 PendingRequests pending_requests_; 112 PendingRequests pending_requests_;
113 113
114 UserIdToUserState user_id_to_user_state_; 114 UserIdToUserState user_id_to_user_state_;
115 115
116 DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp); 116 DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp);
117 }; 117 };
118 118
119 } // namespace mus 119 } // namespace mus
120 120
121 #endif // COMPONENTS_MUS_MUS_APP_H_ 121 #endif // COMPONENTS_MUS_MUS_APP_H_
OLDNEW
« no previous file with comments | « components/mus/DEPS ('k') | components/mus/mus_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698