Preliminary interactive layout of window manager's demo_launcher

mojo/examples/browser/browser.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/basictypes.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/examples/window_manager/window_manager.mojom.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
@@ skipping 157 matching lines @@
       MOJO_OVERRIDE {
     view_manager::ViewManager::ConfigureIncomingConnection(connection, this);
     return true;
   }
 
   void CreateWidget(view_manager::Node* node) {
     views::Textfield* textfield = new views::Textfield;
     textfield->set_controller(this);
 
     views::WidgetDelegateView* widget_delegate = new views::WidgetDelegateView;
-    widget_delegate->GetContentsView()->set_background(
+    contents_view_ = widget_delegate->GetContentsView();
+    contents_view_->set_background(
         views::Background::CreateSolidBackground(SK_ColorBLUE));
-    widget_delegate->GetContentsView()->AddChildView(textfield);
-    widget_delegate->GetContentsView()->SetLayoutManager(
-        new BrowserLayoutManager);
+    contents_view_->AddChildView(textfield);
+    contents_view_->SetLayoutManager(new BrowserLayoutManager);
 
     widget_ = new views::Widget;
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.native_widget = new NativeWidgetViewManager(widget_, node);
     params.delegate = widget_delegate;
     params.bounds = gfx::Rect(node->bounds().width(), node->bounds().height());
     widget_->Init(params);
     // KeyboardManager handles deleting itself when the widget is destroyed.
     new KeyboardManager(widget_, window_manager_.get(), node);
@@ skipping 33 matching lines @@
   virtual void OnNodeFocusChanged(view_manager::Node* gained_focus,
                                   view_manager::Node* lost_focus) OVERRIDE {
     aura::client::FocusClient* focus_client =
         aura::client::GetFocusClient(widget_->GetNativeView());
     if (lost_focus == root_)
       focus_client->FocusWindow(NULL);
     else if (gained_focus == root_)
       focus_client->FocusWindow(widget_->GetNativeView());
   }
 
+  virtual void OnNodeBoundsChanged(view_manager::Node* node,
+                                   const gfx::Rect& /*old_bounds*/,

[sky, 2014/07/11 18:19:46]

We generally don't use this style in chrome code.

+                                   const gfx::Rect& /*new_bounds*/) OVERRIDE {
+    widget_->SetBounds(gfx::Rect(node->bounds().size()));

[sky, 2014/07/11 18:19:46]

NativeWidgetViewManager is a NodeObserver. It should have this code. That'll
dramatically simplify this code:)

+    contents_view_->Layout();

[sky, 2014/07/11 18:19:46]

This should happen automatically as a result of setting the bounds of the
widget.

+  }
+
   scoped_ptr<ViewsInit> views_init_;
 
   view_manager::ViewManager* view_manager_;
   view_manager::Node* root_;
   views::Widget* widget_;
+  views::View* contents_view_;

[sky, 2014/07/11 18:19:46]

initialize this to NULL in the member initializer list.

   navigation::NavigatorHostPtr navigator_host_;
   IWindowManagerPtr window_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 }  // namespace examples
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::Browser;
 }
 
 }  // namespace mojo