| OLD | NEW |
| 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_SHELL_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_ |
| 6 #define MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_ | 6 #define MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <set> | 10 #include <set> |
| 11 #include <string> | 11 #include <string> |
| 12 | 12 |
| 13 #include "mojo/application/public/cpp/application_connection.h" | |
| 14 #include "mojo/application/public/cpp/lib/service_connector_registry.h" | |
| 15 #include "mojo/application/public/interfaces/service_provider.mojom.h" | |
| 16 #include "mojo/application/public/interfaces/shell.mojom.h" | |
| 17 #include "mojo/public/cpp/bindings/binding.h" | 13 #include "mojo/public/cpp/bindings/binding.h" |
| 14 #include "mojo/shell/public/cpp/application_connection.h" |
| 15 #include "mojo/shell/public/cpp/lib/service_connector_registry.h" |
| 16 #include "mojo/shell/public/interfaces/service_provider.mojom.h" |
| 17 #include "mojo/shell/public/interfaces/shell.mojom.h" |
| 18 | 18 |
| 19 namespace mojo { | 19 namespace mojo { |
| 20 namespace internal { | 20 namespace internal { |
| 21 | 21 |
| 22 // A ServiceRegistry represents each half of a connection between two | 22 // A ServiceRegistry represents each half of a connection between two |
| 23 // applications, allowing customization of which services are published to the | 23 // applications, allowing customization of which services are published to the |
| 24 // other. | 24 // other. |
| 25 class ServiceRegistry : public ServiceProvider, public ApplicationConnection { | 25 class ServiceRegistry : public ServiceProvider, public ApplicationConnection { |
| 26 public: | 26 public: |
| 27 ServiceRegistry(); | 27 ServiceRegistry(); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 bool is_content_handler_id_valid_; | 73 bool is_content_handler_id_valid_; |
| 74 std::vector<Closure> content_handler_id_callbacks_; | 74 std::vector<Closure> content_handler_id_callbacks_; |
| 75 base::WeakPtrFactory<ServiceRegistry> weak_factory_; | 75 base::WeakPtrFactory<ServiceRegistry> weak_factory_; |
| 76 | 76 |
| 77 MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceRegistry); | 77 MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceRegistry); |
| 78 }; | 78 }; |
| 79 | 79 |
| 80 } // namespace internal | 80 } // namespace internal |
| 81 } // namespace mojo | 81 } // namespace mojo |
| 82 | 82 |
| 83 #endif // MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_ | 83 #endif // MOJO_SHELL_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_ |
| OLD | NEW |