| Index: mojo/ui/view_provider_app.cc
|
| diff --git a/mojo/ui/view_provider_app.cc b/mojo/ui/view_provider_app.cc
|
| index 4de9593c46f1df0ba336c0c656325d0afc63c6da..a8e4b85c2d927f171b19ab782aca39b297f1883a 100644
|
| --- a/mojo/ui/view_provider_app.cc
|
| +++ b/mojo/ui/view_provider_app.cc
|
| @@ -4,8 +4,6 @@
|
|
|
| #include "mojo/ui/view_provider_app.h"
|
|
|
| -#include <utility>
|
| -
|
| #include "base/command_line.h"
|
| #include "base/logging.h"
|
|
|
| @@ -24,10 +22,9 @@ class ViewProviderApp::DelegatingViewProvider : public mojo::ui::ViewProvider {
|
| // |ViewProvider|:
|
| void CreateView(
|
| mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
|
| - mojo::InterfaceRequest<mojo::ServiceProvider> services,
|
| - mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services) override {
|
| + mojo::InterfaceRequest<mojo::ServiceProvider> services) override {
|
| app_->CreateView(this, view_provider_url_, view_owner_request.Pass(),
|
| - services.Pass(), std::move(exposed_services));
|
| + services.Pass());
|
| }
|
|
|
| ViewProviderApp* app_;
|
| @@ -66,10 +63,8 @@ void ViewProviderApp::CreateView(
|
| DelegatingViewProvider* provider,
|
| const std::string& view_provider_url,
|
| mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
|
| - mojo::InterfaceRequest<mojo::ServiceProvider> services,
|
| - mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services) {
|
| - CreateView(view_provider_url, view_owner_request.Pass(), services.Pass(),
|
| - exposed_services.Pass());
|
| + mojo::InterfaceRequest<mojo::ServiceProvider> services) {
|
| + CreateView(view_provider_url, view_owner_request.Pass(), services.Pass());
|
| }
|
|
|
| } // namespace ui
|
|
|