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

Side by Side Diff: services/service_manager/service_manager.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/service_manager/runner/init.cc ('k') | services/service_manager/service_manager.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_SHELL_SERVICE_MANAGER_H_ 5 #ifndef SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_
6 #define SERVICES_SHELL_SERVICE_MANAGER_H_ 6 #define SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "mojo/public/cpp/bindings/binding_set.h" 14 #include "mojo/public/cpp/bindings/binding_set.h"
15 #include "mojo/public/cpp/bindings/interface_ptr_set.h" 15 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
16 #include "services/shell/connect_params.h" 16 #include "services/service_manager/connect_params.h"
17 #include "services/shell/native_runner.h" 17 #include "services/service_manager/native_runner.h"
18 #include "services/shell/public/cpp/capabilities.h" 18 #include "services/service_manager/public/cpp/capabilities.h"
19 #include "services/shell/public/cpp/identity.h" 19 #include "services/service_manager/public/cpp/identity.h"
20 #include "services/shell/public/cpp/interface_factory.h" 20 #include "services/service_manager/public/cpp/interface_factory.h"
21 #include "services/shell/public/cpp/service.h" 21 #include "services/service_manager/public/cpp/service.h"
22 #include "services/shell/public/interfaces/connector.mojom.h" 22 #include "services/service_manager/public/interfaces/connector.mojom.h"
23 #include "services/shell/public/interfaces/interface_provider.mojom.h" 23 #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
24 #include "services/shell/public/interfaces/resolver.mojom.h" 24 #include "services/service_manager/public/interfaces/resolver.mojom.h"
25 #include "services/shell/public/interfaces/service.mojom.h" 25 #include "services/service_manager/public/interfaces/service.mojom.h"
26 #include "services/shell/public/interfaces/service_factory.mojom.h" 26 #include "services/service_manager/public/interfaces/service_factory.mojom.h"
27 #include "services/shell/public/interfaces/service_manager.mojom.h" 27 #include "services/service_manager/public/interfaces/service_manager.mojom.h"
28 #include "services/shell/service_overrides.h" 28 #include "services/service_manager/service_overrides.h"
29 29
30 namespace shell { 30 namespace shell {
31 class ServiceContext; 31 class ServiceContext;
32 32
33 // Creates an identity for the Service Manager, used when the Service Manager 33 // Creates an identity for the Service Manager, used when the Service Manager
34 // connects to services. 34 // connects to services.
35 Identity CreateServiceManagerIdentity(); 35 Identity CreateServiceManagerIdentity();
36 36
37 class ServiceManager : public Service { 37 class ServiceManager : public Service {
38 public: 38 public:
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 std::unique_ptr<ServiceContext> service_context_; 185 std::unique_ptr<ServiceContext> service_context_;
186 base::WeakPtrFactory<ServiceManager> weak_ptr_factory_; 186 base::WeakPtrFactory<ServiceManager> weak_ptr_factory_;
187 187
188 DISALLOW_COPY_AND_ASSIGN(ServiceManager); 188 DISALLOW_COPY_AND_ASSIGN(ServiceManager);
189 }; 189 };
190 190
191 mojom::Connector::ConnectCallback EmptyConnectCallback(); 191 mojom::Connector::ConnectCallback EmptyConnectCallback();
192 192
193 } // namespace shell 193 } // namespace shell
194 194
195 #endif // SERVICES_SHELL_SERVICE_MANAGER_H_ 195 #endif // SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_
OLDNEW
« no previous file with comments | « services/service_manager/runner/init.cc ('k') | services/service_manager/service_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698