| 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 SERVICES_SHELL_SHELL_H_ | 5 #ifndef SERVICES_SHELL_SHELL_H_ |
| 6 #define SERVICES_SHELL_SHELL_H_ | 6 #define SERVICES_SHELL_SHELL_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 // and this function returns true. | 120 // and this function returns true. |
| 121 bool ConnectToExistingInstance(scoped_ptr<ConnectParams>* params); | 121 bool ConnectToExistingInstance(scoped_ptr<ConnectParams>* params); |
| 122 | 122 |
| 123 Instance* CreateInstance(const Identity& source, | 123 Instance* CreateInstance(const Identity& source, |
| 124 const Identity& target, | 124 const Identity& target, |
| 125 const CapabilitySpec& spec); | 125 const CapabilitySpec& spec); |
| 126 | 126 |
| 127 // Called from the instance implementing mojom::Shell. | 127 // Called from the instance implementing mojom::Shell. |
| 128 void AddInstanceListener(mojom::InstanceListenerPtr listener); | 128 void AddInstanceListener(mojom::InstanceListenerPtr listener); |
| 129 | 129 |
| 130 void CreateShellClientWithFactory(const Identity& source, | 130 void CreateShellClientWithFactory(const Identity& shell_client_factory, |
| 131 const Identity& shell_client_factory, | |
| 132 const std::string& name, | 131 const std::string& name, |
| 133 mojom::ShellClientRequest request); | 132 mojom::ShellClientRequest request); |
| 134 // Returns a running ShellClientFactory for |shell_client_factory_identity|. | 133 // Returns a running ShellClientFactory for |shell_client_factory_identity|. |
| 135 // If there is not one running one is started for |source_identity|. | 134 // If there is not one running one is started for |source_identity|. |
| 136 mojom::ShellClientFactory* GetShellClientFactory( | 135 mojom::ShellClientFactory* GetShellClientFactory( |
| 137 const Identity& shell_client_factory_identity, | 136 const Identity& shell_client_factory_identity); |
| 138 const Identity& source_identity); | |
| 139 void OnShellClientFactoryLost(const Identity& which); | 137 void OnShellClientFactoryLost(const Identity& which); |
| 140 | 138 |
| 141 // Callback when remote Catalog resolves mojo:foo to mojo:bar. | 139 // Callback when remote Catalog resolves mojo:foo to mojo:bar. |
| 142 // |params| are the params passed to Connect(). | 140 // |params| are the params passed to Connect(). |
| 143 // |client| if provided is a ShellClientPtr which should be used to manage the | 141 // |client| if provided is a ShellClientPtr which should be used to manage the |
| 144 // new application instance. This may be null. | 142 // new application instance. This may be null. |
| 145 // |result| contains the result of the resolve operation. | 143 // |result| contains the result of the resolve operation. |
| 146 void OnGotResolvedName(mojom::ShellResolverPtr resolver, | 144 void OnGotResolvedName(mojom::ShellResolverPtr resolver, |
| 147 scoped_ptr<ConnectParams> params, | 145 scoped_ptr<ConnectParams> params, |
| 148 mojom::ShellClientPtr client, | 146 mojom::ShellClientPtr client, |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 | 184 |
| 187 DISALLOW_COPY_AND_ASSIGN(Shell); | 185 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 188 }; | 186 }; |
| 189 | 187 |
| 190 mojom::Connector::ConnectCallback EmptyConnectCallback(); | 188 mojom::Connector::ConnectCallback EmptyConnectCallback(); |
| 191 | 189 |
| 192 } // namespace shell | 190 } // namespace shell |
| 193 } // namespace mojo | 191 } // namespace mojo |
| 194 | 192 |
| 195 #endif // SERVICES_SHELL_SHELL_H_ | 193 #endif // SERVICES_SHELL_SHELL_H_ |
| OLD | NEW |