Add some trivial window decorations & window closing back to the demo window manager

mojo/examples/wm_flow/app/app.cc

 // Copyright 2014 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.
 
 #include "base/bind.h"
 #include "mojo/examples/wm_flow/app/embedder.mojom.h"
 #include "mojo/examples/wm_flow/embedded/embeddee.mojom.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
+#include "mojo/services/public/cpp/view_manager/view_observer.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 
 namespace examples {
 namespace {
 void ConnectCallback(bool success) {}
 
 const SkColor kColors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorYELLOW };
 
 class EmbedderImpl : public mojo::InterfaceImpl<Embedder> {
  public:
   EmbedderImpl() {}
   virtual ~EmbedderImpl() {}
 
  private:
   // Overridden from Embedder:
   virtual void HelloWorld(const mojo::Callback<void()>& callback) OVERRIDE {
     callback.Run();
   }
 
   DISALLOW_COPY_AND_ASSIGN(EmbedderImpl);
 };
 
 }  // namespace
 
 // This app starts its life via Connect() rather than by being embed, so it does
 // not start with a connection to the ViewManager service. It has to obtain a
 // connection by connecting to the ViewManagerInit service and asking to be
 // embed without a view context.
 class WMFlowApp : public mojo::ApplicationDelegate,
-                  public mojo::ViewManagerDelegate {
+                  public mojo::ViewManagerDelegate,
+                  public mojo::ViewObserver {
  public:
   WMFlowApp()
       : embed_count_(0),
-        view_manager_client_factory_(this) {}
+        view_manager_client_factory_(this),
+        app_(NULL) {}
   virtual ~WMFlowApp() {}
 
  private:
   // Overridden from Application:
   virtual void Initialize(mojo::ApplicationImpl* app) MOJO_OVERRIDE {
-    mojo::ServiceProviderPtr sp;
-    mojo::ViewManagerInitServicePtr init_svc;
-    app->ConnectToService("mojo:mojo_view_manager", &init_svc);
-    init_svc->Embed("mojo:mojo_wm_flow_app", sp.Pass(),
-                    base::Bind(&ConnectCallback));
+    app_ = app;
+    OpenNewWindow();
+    OpenNewWindow();
+    OpenNewWindow();
   }
   virtual bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) MOJO_OVERRIDE {
     connection->AddService(&view_manager_client_factory_);
     return true;
   }
 
   void OnConnect(bool success) {}
 
   // Overridden from mojo::ViewManagerDelegate:
   virtual void OnEmbed(
       mojo::ViewManager* view_manager,
       mojo::View* root,
       mojo::ServiceProviderImpl* exported_services,
       scoped_ptr<mojo::ServiceProvider> imported_services) MOJO_OVERRIDE {
+    root->AddObserver(this);

[sky, 2014/08/15 23:09:36]

Remove this some where?

     root->SetColor(kColors[embed_count_++ % arraysize(kColors)]);
 
     mojo::View* embed = mojo::View::Create(view_manager);
     root->AddChild(embed);
-    gfx::Rect bounds = root->bounds();
+    gfx::Rect bounds = gfx::Rect(root->bounds().size());
     bounds.Inset(25, 25);
     embed->SetBounds(bounds);
 
     scoped_ptr<mojo::ServiceProviderImpl> registry(
         new mojo::ServiceProviderImpl);
     // Expose some services to the embeddee...
     registry->AddService(&embedder_factory_);
     scoped_ptr<mojo::ServiceProvider> imported =
         embed->Embed("mojo:mojo_wm_flow_embedded", registry.Pass());
     mojo::ConnectToService(imported.get(), &embeddee_);
     embeddee_->HelloBack(base::Bind(&WMFlowApp::HelloBackAck,
                                     base::Unretained(this)));
   }
   virtual void OnViewManagerDisconnected(
       mojo::ViewManager* view_manager) MOJO_OVERRIDE {}
 
+  // Overridden from mojo::ViewObserver:
+  virtual void OnViewInputEvent(mojo::View* view,
+                                const mojo::EventPtr& event) MOJO_OVERRIDE {
+    if (event->action == mojo::EVENT_TYPE_MOUSE_RELEASED &&
+        event->flags & mojo::EVENT_FLAGS_LEFT_MOUSE_BUTTON) {
+      OpenNewWindow();
+    }
+  }
+  virtual void OnViewDestroyed(mojo::View* view) MOJO_OVERRIDE {
+    --embed_count_;
+  }
+
   void HelloBackAck() {
     printf("HelloBack() ack'ed\n");
   }
 
+  void OpenNewWindow() {
+    mojo::ViewManagerInitServicePtr init_svc;
+    app_->ConnectToService("mojo:mojo_view_manager", &init_svc);
+    mojo::ServiceProviderPtr sp;
+    init_svc->Embed("mojo:mojo_wm_flow_app", sp.Pass(),
+                    base::Bind(&ConnectCallback));
+  }
+
   int embed_count_;
   mojo::ViewManagerClientFactory view_manager_client_factory_;
   mojo::InterfaceFactoryImpl<EmbedderImpl> embedder_factory_;
   EmbeddeePtr embeddee_;
+  mojo::ApplicationImpl* app_;
 
   DISALLOW_COPY_AND_ASSIGN(WMFlowApp);
 };
 
 }  // namespace examples
 
 namespace mojo {
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::WMFlowApp;
 }
 
 }  // namespace