| Index: examples/ui/png_viewer/png_viewer.cc
|
| diff --git a/examples/ui/png_viewer/png_viewer.cc b/examples/ui/png_viewer/png_viewer.cc
|
| index abd5c48ba240b00c5a821f8568a51e4892305845..16265e4d22e216b28fc9c89f967b14b09d714031 100644
|
| --- a/examples/ui/png_viewer/png_viewer.cc
|
| +++ b/examples/ui/png_viewer/png_viewer.cc
|
| @@ -27,11 +27,11 @@ constexpr uint32_t kRootNodeId = mojo::gfx::composition::kSceneRootNodeId;
|
|
|
| class PNGView : public mojo::ui::GaneshView {
|
| public:
|
| - PNGView(
|
| - mojo::ApplicationImpl* app_impl,
|
| - const skia::RefPtr<SkImage>& image,
|
| - const mojo::ui::ViewProvider::CreateViewCallback& create_view_callback)
|
| - : GaneshView(app_impl, "PNGViewer", create_view_callback), image_(image) {
|
| + PNGView(mojo::ApplicationImpl* app_impl,
|
| + mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
|
| + const skia::RefPtr<SkImage>& image)
|
| + : GaneshView(app_impl, view_owner_request.Pass(), "PNGViewer"),
|
| + image_(image) {
|
| DCHECK(image_);
|
| }
|
|
|
| @@ -106,13 +106,12 @@ class PNGContentViewProviderApp : public mojo::ui::ViewProviderApp {
|
|
|
| ~PNGContentViewProviderApp() override {}
|
|
|
| - bool CreateView(
|
| + void CreateView(
|
| const std::string& connection_url,
|
| + mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
|
| mojo::InterfaceRequest<mojo::ServiceProvider> services,
|
| - mojo::ServiceProviderPtr exposed_services,
|
| - const mojo::ui::ViewProvider::CreateViewCallback& callback) override {
|
| - new PNGView(app_impl(), image_, callback);
|
| - return true;
|
| + mojo::ServiceProviderPtr exposed_services) override {
|
| + new PNGView(app_impl(), view_owner_request.Pass(), image_);
|
| }
|
|
|
| private:
|
|
|