| Index: mojo/shell/connect_to_application_params.h
|
| diff --git a/mojo/shell/connect_to_application_params.h b/mojo/shell/connect_to_application_params.h
|
| index badca064e3368f31676575eece71a5ca79cde106..fa648179555d8facb5b5524433fe73c114b60444 100644
|
| --- a/mojo/shell/connect_to_application_params.h
|
| +++ b/mojo/shell/connect_to_application_params.h
|
| @@ -6,6 +6,7 @@
|
| #define MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_
|
|
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "base/callback.h"
|
| #include "mojo/application/public/interfaces/service_provider.mojom.h"
|
| @@ -44,17 +45,23 @@ class ConnectToApplicationParams {
|
| return target_url_request_.get();
|
| }
|
| // NOTE: This doesn't reset |target_|.
|
| - URLRequestPtr TakeTargetURLRequest() { return target_url_request_.Pass(); }
|
| + URLRequestPtr TakeTargetURLRequest() {
|
| + return std::move(target_url_request_);
|
| + }
|
|
|
| void set_services(InterfaceRequest<ServiceProvider> value) {
|
| - services_ = value.Pass();
|
| + services_ = std::move(value);
|
| + }
|
| + InterfaceRequest<ServiceProvider> TakeServices() {
|
| + return std::move(services_);
|
| }
|
| - InterfaceRequest<ServiceProvider> TakeServices() { return services_.Pass(); }
|
|
|
| void set_exposed_services(ServiceProviderPtr value) {
|
| - exposed_services_ = value.Pass();
|
| + exposed_services_ = std::move(value);
|
| + }
|
| + ServiceProviderPtr TakeExposedServices() {
|
| + return std::move(exposed_services_);
|
| }
|
| - ServiceProviderPtr TakeExposedServices() { return exposed_services_.Pass(); }
|
|
|
| void set_on_application_end(const base::Closure& value) {
|
| on_application_end_ = value;
|
|
|