Preliminary interactive layout of window manager's demo_launcher

mojo/views/native_widget_view_manager.cc

Index: mojo/views/native_widget_view_manager.cc
diff --git a/mojo/views/native_widget_view_manager.cc b/mojo/views/native_widget_view_manager.cc
index 36a65786e101b21da096aa89b764d0144be3855a..3c4cfa31fe3ecc90b09a68e90391b00ce11b1bb1 100644
--- a/mojo/views/native_widget_view_manager.cc
+++ b/mojo/views/native_widget_view_manager.cc
@@ -113,9 +113,11 @@ NativeWidgetViewManager::NativeWidgetViewManager(
 }
 
 NativeWidgetViewManager::~NativeWidgetViewManager() {
-  if (node_->active_view())
-    node_->active_view()->RemoveObserver(this);
-  node_->RemoveObserver(this);
+  if (node_) {
+    if (node_->active_view())
+      node_->active_view()->RemoveObserver(this);
+    node_->RemoveObserver(this);
+  }
 }

[sky, 2014/07/15 20:46:48]

I think you're missing the case of the node_ having been destroyed, but not the
view.

 
 void NativeWidgetViewManager::InitNativeWidget(
@@ -133,9 +135,18 @@ void NativeWidgetViewManager::CompositorContentsChanged(
 }
 
 void NativeWidgetViewManager::OnNodeDestroyed(view_manager::Node* node) {
+  DCHECK_EQ(node, node_);
+  node->RemoveObserver(this);
+  node_ = NULL;
   window_tree_host_.reset();
 }
 
+void NativeWidgetViewManager::OnNodeBoundsChanged(view_manager::Node* node,
+                                                  const gfx::Rect& old_bounds,
+                                                  const gfx::Rect& new_bounds) {
+  GetWidget()->SetBounds(gfx::Rect(node->bounds().size()));
+}
+
 void NativeWidgetViewManager::OnNodeActiveViewChanged(
     view_manager::Node* node,
     view_manager::View* old_view,
@@ -153,4 +164,8 @@ void NativeWidgetViewManager::OnViewInputEvent(view_manager::View* view,
     window_tree_host_->SendEventToProcessor(ui_event.get());
 }
 
+void NativeWidgetViewManager::OnViewDestroyed(view_manager::View* view) {
+  view->RemoveObserver(this);
+}
+
 }  // namespace mojo