| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_CONNECT_PARAMS_H_ | 5 #ifndef SERVICES_SERVICE_MANAGER_CONNECT_PARAMS_H_ |
| 6 #define SERVICES_SHELL_CONNECT_PARAMS_H_ | 6 #define SERVICES_SERVICE_MANAGER_CONNECT_PARAMS_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| 11 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "services/shell/public/cpp/identity.h" | 13 #include "services/service_manager/public/cpp/identity.h" |
| 14 #include "services/shell/public/interfaces/connector.mojom.h" | 14 #include "services/service_manager/public/interfaces/connector.mojom.h" |
| 15 #include "services/shell/public/interfaces/interface_provider.mojom.h" | 15 #include "services/service_manager/public/interfaces/interface_provider.mojom.h" |
| 16 | 16 |
| 17 namespace shell { | 17 namespace shell { |
| 18 | 18 |
| 19 // This class represents a request for the application manager to connect to an | 19 // This class represents a request for the application manager to connect to an |
| 20 // application. | 20 // application. |
| 21 class ConnectParams { | 21 class ConnectParams { |
| 22 public: | 22 public: |
| 23 ConnectParams(); | 23 ConnectParams(); |
| 24 ~ConnectParams(); | 24 ~ConnectParams(); |
| 25 | 25 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 | 59 |
| 60 mojom::InterfaceProviderRequest remote_interfaces_; | 60 mojom::InterfaceProviderRequest remote_interfaces_; |
| 61 mojom::ClientProcessConnectionPtr client_process_connection_; | 61 mojom::ClientProcessConnectionPtr client_process_connection_; |
| 62 mojom::Connector::ConnectCallback connect_callback_; | 62 mojom::Connector::ConnectCallback connect_callback_; |
| 63 | 63 |
| 64 DISALLOW_COPY_AND_ASSIGN(ConnectParams); | 64 DISALLOW_COPY_AND_ASSIGN(ConnectParams); |
| 65 }; | 65 }; |
| 66 | 66 |
| 67 } // namespace shell | 67 } // namespace shell |
| 68 | 68 |
| 69 #endif // SERVICES_SHELL_CONNECT_PARAMS_H_ | 69 #endif // SERVICES_SERVICE_MANAGER_CONNECT_PARAMS_H_ |
| OLD | NEW |