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

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

Issue 1296453004: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cherry-pick GL_APIENTRY addition back in Created 5 years, 4 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 | « mojo/application/public/cpp/application_impl.h ('k') | mojo/gles2/command_buffer_client_impl.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 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/public/cpp/bindings/binding.h"
14 15
15 namespace mojo { 16 namespace mojo {
16 namespace internal { 17 namespace internal {
17 18
18 // A ServiceRegistry represents each half of a connection between two 19 // A ServiceRegistry represents each half of a connection between two
19 // applications, allowing customization of which services are published to the 20 // applications, allowing customization of which services are published to the
20 // other. 21 // other.
21 class ServiceRegistry : public ServiceProvider, public ApplicationConnection { 22 class ServiceRegistry : public ServiceProvider, public ApplicationConnection {
22 public: 23 public:
23 ServiceRegistry(); 24 ServiceRegistry();
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 const bool allow_all_interfaces_; 60 const bool allow_all_interfaces_;
60 base::WeakPtrFactory<ApplicationConnection> weak_factory_; 61 base::WeakPtrFactory<ApplicationConnection> weak_factory_;
61 62
62 MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceRegistry); 63 MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceRegistry);
63 }; 64 };
64 65
65 } // namespace internal 66 } // namespace internal
66 } // namespace mojo 67 } // namespace mojo
67 68
68 #endif // MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_ 69 #endif // MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_
OLDNEW
« no previous file with comments | « mojo/application/public/cpp/application_impl.h ('k') | mojo/gles2/command_buffer_client_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698