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

Side by Side Diff: content/common/mojo/service_registry_impl.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
« no previous file with comments | « content/common/mojo/channel_init.h ('k') | content/common/service_port_type_converters.h » ('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 CONTENT_COMMON_MOJO_SERVICE_REGISTRY_IMPL_H_ 5 #ifndef CONTENT_COMMON_MOJO_SERVICE_REGISTRY_IMPL_H_
6 #define CONTENT_COMMON_MOJO_SERVICE_REGISTRY_IMPL_H_ 6 #define CONTENT_COMMON_MOJO_SERVICE_REGISTRY_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <queue> 9 #include <queue>
10 #include <string> 10 #include <string>
11 #include <utility> 11 #include <utility>
12 12
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "content/public/common/service_registry.h" 16 #include "content/public/common/service_registry.h"
17 #include "mojo/application/public/interfaces/service_provider.mojom.h" 17 #include "mojo/application/public/interfaces/service_provider.mojom.h"
18 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" 18 #include "mojo/public/cpp/bindings/binding.h"
19 #include "third_party/mojo/src/mojo/public/cpp/system/core.h" 19 #include "mojo/public/cpp/system/core.h"
20 20
21 namespace content { 21 namespace content {
22 22
23 class CONTENT_EXPORT ServiceRegistryImpl 23 class CONTENT_EXPORT ServiceRegistryImpl
24 : public ServiceRegistry, 24 : public ServiceRegistry,
25 public NON_EXPORTED_BASE(mojo::ServiceProvider) { 25 public NON_EXPORTED_BASE(mojo::ServiceProvider) {
26 public: 26 public:
27 ServiceRegistryImpl(); 27 ServiceRegistryImpl();
28 ~ServiceRegistryImpl() override; 28 ~ServiceRegistryImpl() override;
29 29
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 service_factories_; 62 service_factories_;
63 std::queue<std::pair<std::string, mojo::MessagePipeHandle> > 63 std::queue<std::pair<std::string, mojo::MessagePipeHandle> >
64 pending_connects_; 64 pending_connects_;
65 65
66 base::WeakPtrFactory<ServiceRegistry> weak_factory_; 66 base::WeakPtrFactory<ServiceRegistry> weak_factory_;
67 }; 67 };
68 68
69 } // namespace content 69 } // namespace content
70 70
71 #endif // CONTENT_COMMON_MOJO_SERVICE_REGISTRY_IMPL_H_ 71 #endif // CONTENT_COMMON_MOJO_SERVICE_REGISTRY_IMPL_H_
OLDNEW
« no previous file with comments | « content/common/mojo/channel_init.h ('k') | content/common/service_port_type_converters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698