Clean up WTH creation

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/public/cpp/application/application.h"
 #include "mojo/services/navigation/navigation.mojom.h"
 #include "mojo/services/public/cpp/view_manager/node.h"
@@ skipping 34 matching lines @@
 
   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:
-  Browser() : view_manager_(NULL), view_(NULL) {}
+  Browser() : view_manager_(NULL) {}
 
   virtual ~Browser() {
   }
 
  private:
   // Overridden from Application:
   virtual void Initialize() MOJO_OVERRIDE {
     views_init_.reset(new ViewsInit);
     view_manager::ViewManager::Create(this, this);
     ConnectTo("mojo:mojo_window_manager", &navigator_host_);
   }
 
-  void CreateWidget(const gfx::Size& size) {
+  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()->AddChildView(textfield);
     widget_delegate->GetContentsView()->SetLayoutManager(
         new BrowserLayoutManager);
 
     views::Widget* widget = new views::Widget;
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-    params.native_widget = new NativeWidgetViewManager(widget, view_);
+    params.native_widget = new NativeWidgetViewManager(widget, node);
     params.delegate = widget_delegate;
-    params.bounds = gfx::Rect(size.width(), size.height());
+    params.bounds = gfx::Rect(node->bounds().width(), node->bounds().height());
     widget->Init(params);
     widget->Show();
     textfield->RequestFocus();
   }
 
   // view_manager::ViewManagerDelegate:
   virtual void OnRootAdded(view_manager::ViewManager* view_manager,
                            view_manager::Node* root) OVERRIDE {
     // TODO: deal with OnRootAdded() being invoked multiple times.
     view_manager_ = view_manager;
-    view_ = view_manager::View::Create(view_manager_);
-    view_manager_->GetRoots().front()->SetActiveView(view_);
+    root->SetActiveView(view_manager::View::Create(view_manager));
     root->SetFocus();
-    CreateWidget(root->bounds().size());
+    CreateWidget(root);
   }
 
   // views::TextfieldController:
   virtual bool HandleKeyEvent(views::Textfield* sender,
                               const ui::KeyEvent& key_event) OVERRIDE {
     if (key_event.key_code() == ui::VKEY_RETURN) {
       GURL url(sender->text());
       printf("User entered this URL: %s\n", url.spec().c_str());
       navigation::NavigationDetailsPtr nav_details(
           navigation::NavigationDetails::New());
@@ skipping 10 matching lines @@
     if (EndsWith(new_contents, base::ASCIIToUTF16("]"), false)) {
       sender->SetText(new_contents.substr(0, new_contents.size() - 1));
       HandleKeyEvent(sender, ui::KeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_RETURN,
                                           0, false));
     }
   }
 
   scoped_ptr<ViewsInit> views_init_;
 
   view_manager::ViewManager* view_manager_;
-  view_manager::View* view_;
   navigation::NavigatorHostPtr navigator_host_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 }  // namespace examples
 
 // static
 Application* Application::Create() {
   return new examples::Browser;
 }
 
 }  // namespace mojo