Index: mojo/ui/view_provider_app.cc |
diff --git a/mojo/ui/view_provider_app.cc b/mojo/ui/view_provider_app.cc |
index 40d5a5bc8e526484fa9c4577821fb575eb0a1730..ddec390f5c4e5f5445cc91ceeae718e86e99b192 100644 |
--- a/mojo/ui/view_provider_app.cc |
+++ b/mojo/ui/view_provider_app.cc |
@@ -4,6 +4,8 @@ |
#include "mojo/ui/view_provider_app.h" |
+#include <utility> |
+ |
#include "base/command_line.h" |
#include "base/logging.h" |
@@ -22,10 +24,10 @@ class ViewProviderApp::DelegatingViewProvider : public mojo::ui::ViewProvider { |
// |ViewProvider|: |
void CreateView( |
mojo::InterfaceRequest<mojo::ServiceProvider> services, |
- mojo::ServiceProviderPtr exposed_services, |
+ mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services, |
const mojo::ui::ViewProvider::CreateViewCallback& callback) override { |
app_->CreateView(this, view_provider_url_, services.Pass(), |
- exposed_services.Pass(), callback); |
+ std::move(exposed_services), callback); |
} |
ViewProviderApp* app_; |
@@ -66,10 +68,10 @@ void ViewProviderApp::CreateView( |
DelegatingViewProvider* provider, |
const std::string& view_provider_url, |
mojo::InterfaceRequest<mojo::ServiceProvider> services, |
- mojo::ServiceProviderPtr exposed_services, |
+ mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services, |
const mojo::ui::ViewProvider::CreateViewCallback& callback) { |
- if (!CreateView(view_provider_url, services.Pass(), exposed_services.Pass(), |
- callback)) { |
+ if (!CreateView(view_provider_url, services.Pass(), |
+ std::move(exposed_services), callback)) { |
bindings_.RemoveBindings(provider); |
delete provider; |
} |