Reify view ownership as a message pipe.

examples/moterm_example_app/moterm_example_app.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This is a simple example application (with an embeddable view), which embeds
 // the Moterm view, uses it to prompt the user, etc.
 
 #include <string.h>
 
 #include <algorithm>
@@ skipping 14 matching lines @@
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/files/interfaces/file.mojom.h"
 #include "mojo/services/files/interfaces/types.mojom.h"
 #include "mojo/services/terminal/interfaces/terminal.mojom.h"
 #include "mojo/services/terminal/interfaces/terminal_client.mojom.h"
 #include "mojo/services/ui/views/interfaces/view_manager.mojom.h"
 #include "mojo/services/ui/views/interfaces/view_provider.mojom.h"
 #include "mojo/services/ui/views/interfaces/views.mojom.h"
+#include "mojo/ui/view_provider_app.h"
 
 // Kind of like |fputs()| (doesn't wait for result).
 void Fputs(mojo::files::File* file, const char* s) {
   size_t length = strlen(s);
   auto a = mojo::Array<uint8_t>::New(length);
   memcpy(&a[0], s, length);
 
   file->Write(a.Pass(), 0, mojo::files::Whence::FROM_CURRENT,
               mojo::files::File::WriteCallback());
 }
 
 class MotermExampleAppView {
  public:
   MotermExampleAppView(
       mojo::Shell* shell,
-      const mojo::ui::ViewProvider::CreateViewCallback& callback)
+      mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request)
       : shell_(shell), weak_factory_(this) {
     // Connect to the moterm app.
     LOG(INFO) << "Connecting to moterm";
     mojo::ServiceProviderPtr moterm_app;
     shell->ConnectToApplication("mojo:moterm", GetProxy(&moterm_app), nullptr);
 
     // Create the moterm view and pass it back to the client directly.
     mojo::ConnectToService(moterm_app.get(), &moterm_view_provider_);
     mojo::ServiceProviderPtr moterm_service_provider;
-    moterm_view_provider_->CreateView(GetProxy(&moterm_service_provider),
-                                      nullptr, callback);
+    moterm_view_provider_->CreateView(
+        view_owner_request.Pass(), GetProxy(&moterm_service_provider), nullptr);
 
     // Connect to the moterm terminal service associated with the view
     // we just created.
     mojo::ConnectToService(moterm_service_provider.get(), &moterm_terminal_);
 
     // Start running.
     StartPrompt(true);
   }
 
   ~MotermExampleAppView() {}
@@ skipping 75 matching lines @@
 
   mojo::terminal::TerminalPtr moterm_terminal_;
   // Valid while prompting.
   mojo::files::FilePtr moterm_file_;
 
   base::WeakPtrFactory<MotermExampleAppView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MotermExampleAppView);
 };
 
-class MotermExampleApp : public mojo::ApplicationDelegate,
-                         public mojo::InterfaceFactory<mojo::ui::ViewProvider>,
-                         public mojo::ui::ViewProvider {
+class MotermExampleApp : public mojo::ui::ViewProviderApp {
  public:
-  MotermExampleApp() : application_impl_() {}
+  MotermExampleApp() {}
   ~MotermExampleApp() override {}
 
- private:
-  // |mojo::ApplicationDelegate|:
-  void Initialize(mojo::ApplicationImpl* application_impl) override {
-    DCHECK(!application_impl_);
-    application_impl_ = application_impl;
+  // |ViewProviderApp|:
+  void CreateView(
+      const std::string& connection_url,
+      mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
+      mojo::InterfaceRequest<mojo::ServiceProvider> services,
+      mojo::ServiceProviderPtr exposed_services) override {
+    new MotermExampleAppView(app_impl()->shell(), view_owner_request.Pass());
   }
 
-  bool ConfigureIncomingConnection(
-      mojo::ApplicationConnection* connection) override {
-    connection->AddService<mojo::ui::ViewProvider>(this);
-    return true;
-  }
-
-  // |InterfaceFactory<mojo::ui::ViewProvider>|:
-  void Create(mojo::ApplicationConnection* connection,
-              mojo::InterfaceRequest<mojo::ui::ViewProvider> request) override {
-    bindings_.AddBinding(this, request.Pass());
-  }
-
-  // |ViewProvider|:
-  void CreateView(mojo::InterfaceRequest<mojo::ServiceProvider> services,
-                  mojo::ServiceProviderPtr exposed_services,
-                  const CreateViewCallback& callback) override {
-    new MotermExampleAppView(application_impl_->shell(), callback);
-  }
-
-  mojo::ApplicationImpl* application_impl_;
-  mojo::BindingSet<mojo::ui::ViewProvider> bindings_;
-
+ private:
   DISALLOW_COPY_AND_ASSIGN(MotermExampleApp);
 };
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new MotermExampleApp());
   return runner.Run(application_request);
 }