Add a simple browser UI (with url bar)

mandoline/ui/browser/browser.cc

 // Copyright 2015 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 "mandoline/ui/browser/browser.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
+#include "mandoline/ui/browser/browser_ui.h"
 #include "mandoline/ui/browser/merged_service_provider.h"
 #include "mojo/application/application_runner_chromium.h"
+#include "mojo/converters/geometry/geometry_type_converters.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace mandoline {
 
 Browser::Browser()
     : window_manager_app_(new window_manager::WindowManagerApp(this, this)),
       root_(nullptr),
       content_(nullptr),
       navigator_host_(this),
+      ui_(nullptr),
       weak_factory_(this) {
   exposed_services_impl_.AddService(this);
 }
 
 Browser::~Browser() {
 }
 
 base::WeakPtr<Browser> Browser::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 void Browser::Initialize(mojo::ApplicationImpl* app) {
   window_manager_app_->Initialize(app);
+  ui_.reset(BrowserUI::Create(this, app->shell()));
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   base::CommandLine::StringVector args = command_line->GetArgs();
   if (args.empty()) {
     default_url_ = "http://www.google.com/";
   } else {
 #if defined(OS_WIN)
     default_url_ = base::WideToUTF8(args[0]);
 #else
     default_url_ = args[0];
@@ skipping 13 matching lines @@
   return true;
 }
 
 void Browser::OnEmbed(
     mojo::View* root,
     mojo::InterfaceRequest<mojo::ServiceProvider> services,
     mojo::ServiceProviderPtr exposed_services) {
   // Browser does not support being embedded more than once.
   CHECK(!root_);
 
+  // TODO(beng): still unhappy with the fact that both this class & the UI class
+  //             know so much about these views. Figure out how to shift more to
+  //             the UI class.
   root_ = root;
-  root_->AddObserver(this);
+  content_ = root->view_manager()->CreateView();
+  ui_->Init(root_, content_);
 
 #if defined(OS_ANDROID)
   // Resize to match the Nexus 5 aspect ratio:
   window_manager_app_->SetViewportSize(gfx::Size(320, 640));
 #else
   window_manager_app_->SetViewportSize(gfx::Size(1280, 800));
 #endif
 
-  content_ = root->view_manager()->CreateView();
-  content_->SetBounds(root_->bounds());
   root_->AddChild(content_);
   content_->SetVisible(true);
 
   window_manager_app_->AddAccelerator(mojo::KEYBOARD_CODE_BROWSER_BACK,
                                       mojo::EVENT_FLAGS_NONE);
 
   // Now that we're ready, either load a pending url or the default url.
   if (!pending_url_.empty())
     Embed(pending_url_, services.Pass(), exposed_services.Pass());
   else if (!default_url_.empty())
@@ skipping 29 matching lines @@
 void Browser::Create(mojo::ApplicationConnection* connection,
                      mojo::InterfaceRequest<mojo::NavigatorHost> request) {
   navigator_host_.Bind(request.Pass());
 }
 
 void Browser::OnViewManagerDisconnected(
     mojo::ViewManager* view_manager) {
   root_ = nullptr;
 }
 
-void Browser::OnViewDestroyed(mojo::View* view) {
-  view->RemoveObserver(this);
-}
-
-void Browser::OnViewBoundsChanged(mojo::View* view,
-                                              const mojo::Rect& old_bounds,
-                                              const mojo::Rect& new_bounds) {
-  content_->SetBounds(new_bounds);
-}
-
 // Convenience method:
 void Browser::ReplaceContentWithURL(const mojo::String& url) {
   Embed(url, nullptr, nullptr);
 }
 
 }  // namespace mandoline
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mandoline::Browser);
   return runner.Run(shell_handle);
 }