Provide an API to the example window manager app that supports closing a window.

mojo/examples/window_manager/window_manager.cc

Index: mojo/examples/window_manager/window_manager.cc
diff --git a/mojo/examples/window_manager/window_manager.cc b/mojo/examples/window_manager/window_manager.cc
index e43fa0896a565fcc189b2b389f3029fd40bb16d2..1dc1b29c85906560e70269902b6f69aebccc61eb 100644
--- a/mojo/examples/window_manager/window_manager.cc
+++ b/mojo/examples/window_manager/window_manager.cc
@@ -4,53 +4,105 @@
 
 #include "base/basictypes.h"
 #include "base/bind.h"
+#include "mojo/examples/window_manager/window_manager.mojom.h"
 #include "mojo/public/cpp/application/application.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_observer.h"
 #include "mojo/services/public/cpp/view_manager/view_tree_node.h"
+#include "ui/events/event_constants.h"
+
+#if defined CreateWindow
+#undef CreateWindow
+#endif
 
 namespace mojo {
 namespace examples {
 
-class WindowManager : public Application {
+class WindowManager;
+
+class WindowManagerConnection : public InterfaceImpl<IWindowManager> {
+ public:
+  explicit WindowManagerConnection(WindowManager* window_manager)
+      : window_manager_(window_manager) {}
+  virtual ~WindowManagerConnection() {}
+
+ private:
+  // Overridden from IWindowManager:
+  virtual void CloseWindow(view_manager::TransportNodeId node_id) OVERRIDE;
+
+  WindowManager* window_manager_;
+
+  DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection);
+};
+
+class WindowManager : public Application,
+                      public view_manager::ViewObserver {
  public:
   WindowManager() {}
   virtual ~WindowManager() {}
 
+  void CloseWindow(view_manager::TransportNodeId node_id) {
+    DCHECK(view_manager_);
+    view_manager::ViewTreeNode* node = view_manager_->GetNodeById(node_id);
+    DCHECK(node);
+    node->Destroy();
+  }
+
  private:
   // Overridden from Application:
   virtual void Initialize() MOJO_OVERRIDE {
-    view_manager_ = view_manager::ViewManager::CreateBlocking(this,
-        base::Bind(&WindowManager::OnRootAdded, base::Unretained(this)));
+    AddService<WindowManagerConnection>(this);
+
+    view_manager_ = view_manager::ViewManager::CreateBlocking(this);
     view_manager::ViewTreeNode* node =
         view_manager::ViewTreeNode::Create(view_manager_);
     view_manager_->roots().front()->AddChild(node);
     node->SetBounds(gfx::Rect(800, 600));
+    parent_node_id_ = node->id();
 
     view_manager::View* view = view_manager::View::Create(view_manager_);
     node->SetActiveView(view);
     view->SetColor(SK_ColorBLUE);
+    view->AddObserver(this);
+  }
+
+    // Overridden from ViewObserver:
+  virtual void OnViewInputEvent(view_manager::View* view,
+                                EventPtr event) OVERRIDE {
+    if (event->action == ui::ET_MOUSE_RELEASED)
+      CreateWindow();
+  }
+
+  void CreateWindow() {
+    view_manager::ViewTreeNode* node =
+        view_manager_->GetNodeById(parent_node_id_);
+
+    gfx::Rect bounds(50, 50, 200, 200);
+    if (!node->children().empty()) {
+      gfx::Point position = node->children().back()->bounds().origin();
+      position.Offset(50, 50);
+      bounds.set_origin(position);
+    }
 
     view_manager::ViewTreeNode* embedded =
         view_manager::ViewTreeNode::Create(view_manager_);
     node->AddChild(embedded);
-    embedded->SetBounds(gfx::Rect(50, 50, 200, 200));
+    embedded->SetBounds(bounds);
     embedded->Embed("mojo:mojo_embedded_app");
-
-    view_manager::ViewTreeNode* embedded2 =
-        view_manager::ViewTreeNode::Create(view_manager_);
-    node->AddChild(embedded2);
-    embedded2->SetBounds(gfx::Rect(250, 250, 200, 200));
-    embedded2->Embed("mojo:mojo_embedded_app");
   }
 
-  void OnRootAdded(view_manager::ViewManager* view_manager) {}
-
   view_manager::ViewManager* view_manager_;
+  view_manager::TransportNodeId parent_node_id_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
+void WindowManagerConnection::CloseWindow(
+    view_manager::TransportNodeId node_id) {
+  window_manager_->CloseWindow(node_id);
+}
+
 }  // namespace examples
 
 // static