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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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/public/cpp/window_tree_host_factory.cc ('k') | services/ui/service.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 SERVICES_UI_SERVICE_H_ 5 #ifndef SERVICES_UI_SERVICE_H_
6 #define SERVICES_UI_SERVICE_H_ 6 #define SERVICES_UI_SERVICE_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 "services/shell/public/cpp/interface_factory.h" 16 #include "services/service_manager/public/cpp/interface_factory.h"
17 #include "services/shell/public/cpp/service.h" 17 #include "services/service_manager/public/cpp/service.h"
18 #include "services/shell/public/cpp/service_runner.h" 18 #include "services/service_manager/public/cpp/service_runner.h"
19 #include "services/tracing/public/cpp/provider.h" 19 #include "services/tracing/public/cpp/provider.h"
20 #include "services/ui/ime/ime_registrar_impl.h" 20 #include "services/ui/ime/ime_registrar_impl.h"
21 #include "services/ui/ime/ime_server_impl.h" 21 #include "services/ui/ime/ime_server_impl.h"
22 #include "services/ui/input_devices/input_device_server.h" 22 #include "services/ui/input_devices/input_device_server.h"
23 #include "services/ui/public/interfaces/accessibility_manager.mojom.h" 23 #include "services/ui/public/interfaces/accessibility_manager.mojom.h"
24 #include "services/ui/public/interfaces/clipboard.mojom.h" 24 #include "services/ui/public/interfaces/clipboard.mojom.h"
25 #include "services/ui/public/interfaces/display.mojom.h" 25 #include "services/ui/public/interfaces/display.mojom.h"
26 #include "services/ui/public/interfaces/gpu_service.mojom.h" 26 #include "services/ui/public/interfaces/gpu_service.mojom.h"
27 #include "services/ui/public/interfaces/ime.mojom.h" 27 #include "services/ui/public/interfaces/ime.mojom.h"
28 #include "services/ui/public/interfaces/user_access_manager.mojom.h" 28 #include "services/ui/public/interfaces/user_access_manager.mojom.h"
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 std::unique_ptr<ws::TouchController> touch_controller_; 183 std::unique_ptr<ws::TouchController> touch_controller_;
184 IMERegistrarImpl ime_registrar_; 184 IMERegistrarImpl ime_registrar_;
185 IMEServerImpl ime_server_; 185 IMEServerImpl ime_server_;
186 186
187 DISALLOW_COPY_AND_ASSIGN(Service); 187 DISALLOW_COPY_AND_ASSIGN(Service);
188 }; 188 };
189 189
190 } // namespace ui 190 } // namespace ui
191 191
192 #endif // SERVICES_UI_SERVICE_H_ 192 #endif // SERVICES_UI_SERVICE_H_
OLDNEW
« no previous file with comments | « services/ui/public/cpp/window_tree_host_factory.cc ('k') | services/ui/service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698