| 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..e7b9dd5a54fd58719550e716f0fd6c87e9418555 100644
|
| --- a/mojo/ui/view_provider_app.cc
|
| +++ b/mojo/ui/view_provider_app.cc
|
| @@ -21,11 +21,11 @@ class ViewProviderApp::DelegatingViewProvider : public mojo::ui::ViewProvider {
|
| private:
|
| // |ViewProvider|:
|
| void CreateView(
|
| + mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
|
| mojo::InterfaceRequest<mojo::ServiceProvider> services,
|
| - mojo::ServiceProviderPtr exposed_services,
|
| - const mojo::ui::ViewProvider::CreateViewCallback& callback) override {
|
| - app_->CreateView(this, view_provider_url_, services.Pass(),
|
| - exposed_services.Pass(), callback);
|
| + mojo::ServiceProviderPtr exposed_services) override {
|
| + app_->CreateView(this, view_provider_url_, view_owner_request.Pass(),
|
| + services.Pass(), exposed_services.Pass());
|
| }
|
|
|
| ViewProviderApp* app_;
|
| @@ -65,14 +65,11 @@ void ViewProviderApp::Create(
|
| 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::ServiceProviderPtr exposed_services,
|
| - const mojo::ui::ViewProvider::CreateViewCallback& callback) {
|
| - if (!CreateView(view_provider_url, services.Pass(), exposed_services.Pass(),
|
| - callback)) {
|
| - bindings_.RemoveBindings(provider);
|
| - delete provider;
|
| - }
|
| + mojo::ServiceProviderPtr exposed_services) {
|
| + CreateView(view_provider_url, view_owner_request.Pass(), services.Pass(),
|
| + exposed_services.Pass());
|
| }
|
|
|
| } // namespace ui
|
|
|