| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_PUBLIC_CPP_CONNECTOR_H_ | 5 #ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CONNECTOR_H_ |
| 6 #define SERVICES_SHELL_PUBLIC_CPP_CONNECTOR_H_ | 6 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CONNECTOR_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "services/shell/public/cpp/connection.h" | 10 #include "services/service_manager/public/cpp/connection.h" |
| 11 #include "services/shell/public/cpp/identity.h" | 11 #include "services/service_manager/public/cpp/identity.h" |
| 12 #include "services/shell/public/interfaces/connector.mojom.h" | 12 #include "services/service_manager/public/interfaces/connector.mojom.h" |
| 13 #include "services/shell/public/interfaces/service.mojom.h" | 13 #include "services/service_manager/public/interfaces/service.mojom.h" |
| 14 #include "services/shell/public/interfaces/service_manager.mojom.h" | 14 #include "services/service_manager/public/interfaces/service_manager.mojom.h" |
| 15 | 15 |
| 16 namespace shell { | 16 namespace shell { |
| 17 | 17 |
| 18 // An interface that encapsulates the Mojo Shell's broker interface by which | 18 // An interface that encapsulates the Mojo Shell's broker interface by which |
| 19 // connections between applications are established. Once Connect() is called, | 19 // connections between applications are established. Once Connect() is called, |
| 20 // this class is bound to the thread the call was made on and it cannot be | 20 // this class is bound to the thread the call was made on and it cannot be |
| 21 // passed to another thread without calling Clone(). | 21 // passed to another thread without calling Clone(). |
| 22 // An instance of this class is created internally by ServiceContext for use | 22 // An instance of this class is created internally by ServiceContext for use |
| 23 // on the thread ServiceContext is instantiated on, and this interface is | 23 // on the thread ServiceContext is instantiated on, and this interface is |
| 24 // wrapped by the Shell interface. | 24 // wrapped by the Shell interface. |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 } | 103 } |
| 104 | 104 |
| 105 // Creates a new instance of this class which may be passed to another thread. | 105 // Creates a new instance of this class which may be passed to another thread. |
| 106 // The returned object may be passed multiple times until Connect() is called, | 106 // The returned object may be passed multiple times until Connect() is called, |
| 107 // at which point this method must be called again to pass again. | 107 // at which point this method must be called again to pass again. |
| 108 virtual std::unique_ptr<Connector> Clone() = 0; | 108 virtual std::unique_ptr<Connector> Clone() = 0; |
| 109 }; | 109 }; |
| 110 | 110 |
| 111 } // namespace shell | 111 } // namespace shell |
| 112 | 112 |
| 113 #endif // SERVICES_SHELL_PUBLIC_CPP_CONNECTOR_H_ | 113 #endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CONNECTOR_H_ |
| OLD | NEW |