Launching + Views

mojo/examples/browser/browser.cc

Index: mojo/examples/browser/browser.cc
diff --git a/mojo/examples/browser/browser.cc b/mojo/examples/browser/browser.cc
index 9757d0f53a74e42c17f820c05a728349a956b00b..efc9d5bfd49f8ecf180685c80d7275f0fe437798 100644
--- a/mojo/examples/browser/browser.cc
+++ b/mojo/examples/browser/browser.cc
@@ -14,7 +14,7 @@
 #include "mojo/views/views_init.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
-#include "ui/views/layout/fill_layout.h"
+#include "ui/views/layout/layout_manager.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "url/gurl.h"
@@ -22,11 +22,60 @@
 namespace mojo {
 namespace examples {
 
+class NodeView : public views::View {
+ public:
+  explicit NodeView(view_manager::ViewTreeNode* node) : node_(node) {
+    // This class is provisional and assumes that the node has already been
+    // added to a parent. I suspect we'll want to make an improved version of
+    // this that lives in ui/views akin to NativeViewHost that properly
+    // attaches/detaches when the view is.
+    DCHECK(node->parent());
+  }
+  virtual ~NodeView() {}
+
+  // Overridden from views::View:
+  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE {
+    node_->SetBounds(ConvertRectToWidget(GetLocalBounds()));
+  }
+
+ private:
+  view_manager::ViewTreeNode* node_;
+
+  DISALLOW_COPY_AND_ASSIGN(NodeView);
+};
+
+class BrowserLayoutManager : public views::LayoutManager {
+ public:
+  BrowserLayoutManager() {}
+  virtual ~BrowserLayoutManager() {}
+
+ private:
+  // Overridden from views::LayoutManager:
+  virtual void Layout(views::View* host) OVERRIDE {
+    // Browser view has two children:
+    // 1. text input field.
+    // 2. content view.
+    DCHECK_EQ(2, host->child_count());
+    views::View* text_field = host->child_at(0);

[Aaron Boodman, 2014/06/13 20:09:52]

weird to fish views out of the layout by index? Is that how its usually done? I
would typically expect to see pointers saved to these views somewhere when the
views were added to the layout. But I don't have a lot of experience with Views
and layout managers.

[Ben Goodger (Google), 2014/06/13 20:29:28]

Yeah that's what you'd typically do, but this is shitty code ;-)

I figured whoever takes ownership of this browser app would do a nice job
figuring out what the code should look like. I think there'll be more views in
the fullness of time.

+    gfx::Size ps = text_field->GetPreferredSize();
+    text_field->SetBoundsRect(gfx::Rect(host->width(), ps.height()));
+    views::View* content_area = host->child_at(1);
+    content_area->SetBounds(0, text_field->bounds().bottom(), host->width(),
+                            host->height() - text_field->bounds().bottom());
+  }
+  virtual gfx::Size GetPreferredSize(const views::View* host) const OVERRIDE {
+    return gfx::Size();
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(BrowserLayoutManager);
+};
+
 // This is the basics of creating a views widget with a textfield.
 // TODO: cleanup!
 class Browser : public Application,
                 public view_manager::ViewManagerDelegate,
-                public views::TextfieldController {
+                public views::TextfieldController,
+                public InterfaceImpl<launcher::LauncherClient> {
  public:
   Browser() : view_manager_(NULL), view_(NULL) {}
 
@@ -37,25 +86,27 @@ class Browser : public Application,
   // Overridden from Application:
   virtual void Initialize() MOJO_OVERRIDE {
     views_init_.reset(new ViewsInit);
-
     view_manager::ViewManager::Create(this, this);
-
     ConnectTo("mojo:mojo_launcher", &launcher_);
+    launcher_.set_client(this);
   }
 
-  void CreateWidget() {
+  void CreateWidget(const gfx::Size& size) {
     views::Textfield* textfield = new views::Textfield;
     textfield->set_controller(this);
 
     views::WidgetDelegateView* widget_delegate = new views::WidgetDelegateView;
     widget_delegate->GetContentsView()->AddChildView(textfield);
-    widget_delegate->GetContentsView()->SetLayoutManager(new views::FillLayout);
+    widget_delegate->GetContentsView()->AddChildView(
+        new NodeView(content_node_));
+    widget_delegate->GetContentsView()->SetLayoutManager(
+        new BrowserLayoutManager);
 
     views::Widget* widget = new views::Widget;
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
     params.native_widget = new NativeWidgetViewManager(widget, view_);
     params.delegate = widget_delegate;
-    params.bounds = gfx::Rect(200, 200);
+    params.bounds = gfx::Rect(size.width(), size.height());
     widget->Init(params);
     widget->Show();
     textfield->RequestFocus();
@@ -69,7 +120,12 @@ class Browser : public Application,
     view_ = view_manager::View::Create(view_manager_);
     view_manager_->GetRoots().front()->SetActiveView(view_);
 
-    CreateWidget();
+    content_node_ = view_manager::ViewTreeNode::Create(view_manager_);
+    root->AddChild(content_node_);
+
+    root->SetFocus();
+
+    CreateWidget(root->bounds().size());
   }
   virtual void OnRootRemoved(view_manager::ViewManager* view_manager,
                              view_manager::ViewTreeNode* root) OVERRIDE {
@@ -86,10 +142,25 @@ class Browser : public Application,
     return false;
   }
 
+  // launcher::LauncherClient:
+  virtual void OnLaunch(
+      const String& handler_url,
+      URLResponsePtr response,
+      ScopedDataPipeConsumerHandle response_body_stream) OVERRIDE {
+    content_node_->Embed(handler_url);
+
+    launcher::LaunchablePtr launchable;
+    ConnectTo(handler_url, &launchable);
+    launchable->OnLaunch(response.Pass(),
+                         response_body_stream.Pass(),
+                         content_node_->id());
+  }
+
   scoped_ptr<ViewsInit> views_init_;
 
   view_manager::ViewManager* view_manager_;
   view_manager::View* view_;
+  view_manager::ViewTreeNode* content_node_;

[Aaron Boodman, 2014/06/13 20:09:52]

content_node_ needs an initializer.

[Ben Goodger (Google), 2014/06/13 20:29:28]

Done.

   launcher::LauncherPtr launcher_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);