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

Side by Side Diff: mojo/application/public/cpp/lib/service_registry.h

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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
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 MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_ 5 #ifndef MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
6 #define MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_ 6 #define MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
11 #include "mojo/application/public/cpp/application_connection.h" 11 #include "mojo/application/public/cpp/application_connection.h"
12 #include "mojo/application/public/cpp/lib/service_connector_registry.h" 12 #include "mojo/application/public/cpp/lib/service_connector_registry.h"
13 #include "mojo/application/public/interfaces/service_provider.mojom.h" 13 #include "mojo/application/public/interfaces/service_provider.mojom.h"
14 #include "mojo/application/public/interfaces/shell.mojom.h" 14 #include "mojo/application/public/interfaces/shell.mojom.h"
15 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" 15 #include "mojo/public/cpp/bindings/binding.h"
16 16
17 namespace mojo { 17 namespace mojo {
18 namespace internal { 18 namespace internal {
19 19
20 // A ServiceRegistry represents each half of a connection between two 20 // A ServiceRegistry represents each half of a connection between two
21 // applications, allowing customization of which services are published to the 21 // applications, allowing customization of which services are published to the
22 // other. 22 // other.
23 class ServiceRegistry : public ServiceProvider, public ApplicationConnection { 23 class ServiceRegistry : public ServiceProvider, public ApplicationConnection {
24 public: 24 public:
25 ServiceRegistry(); 25 ServiceRegistry();
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 std::vector<Closure> content_handler_id_callbacks_; 72 std::vector<Closure> content_handler_id_callbacks_;
73 base::WeakPtrFactory<ServiceRegistry> weak_factory_; 73 base::WeakPtrFactory<ServiceRegistry> weak_factory_;
74 74
75 MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceRegistry); 75 MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceRegistry);
76 }; 76 };
77 77
78 } // namespace internal 78 } // namespace internal
79 } // namespace mojo 79 } // namespace mojo
80 80
81 #endif // MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_ 81 #endif // MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
OLDNEW
« no previous file with comments | « mojo/application/public/cpp/lib/service_provider_impl.cc ('k') | mojo/application/public/cpp/service_connector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698