Makes browser resize content when root bounds change

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() {
+  if (root_) {
+    root_->RemoveObserver(this);
+    root_ = nullptr;
+  }
 }
 
 base::WeakPtr<Browser> Browser::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
+// Convenience method:
+void Browser::ReplaceContentWithURL(const mojo::String& url) {

[sky, 2015/05/11 22:01:27]

I moved a couple of things to match declaration order.

+  Embed(url, nullptr, nullptr);
+}
+
 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)
@@ skipping 20 matching lines @@
     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
 
   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())
     Embed(default_url_, services.Pass(), exposed_services.Pass());
 }
 
+void Browser::OnViewManagerDisconnected(
+    mojo::ViewManager* view_manager) {
+  root_->RemoveObserver(this);
+  root_ = nullptr;
+}
+
 void Browser::Embed(const mojo::String& url,
                     mojo::InterfaceRequest<mojo::ServiceProvider> services,
                     mojo::ServiceProviderPtr exposed_services) {
   // We can get Embed calls before we've actually been
   // embedded into the root view and content_ is created.
   // Just save the last url, we'll embed it when we're ready.
   if (!content_) {
     pending_url_ = url;
     return;
   }
@@ skipping 11 matching lines @@
                                    mojo::EventFlags flags) {
   DCHECK_EQ(mojo::KEYBOARD_CODE_BROWSER_BACK, keyboard_code);
   navigator_host_.RequestNavigateHistory(-1);
 }
 
 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;
-}
-
-// Convenience method:
-void Browser::ReplaceContentWithURL(const mojo::String& url) {
-  Embed(url, nullptr, nullptr);
+void Browser::OnViewBoundsChanged(mojo::View* view,
+                                  const mojo::Rect& old_bounds,
+                                  const mojo::Rect& new_bounds) {
+  content_->SetBounds(
+      *mojo::Rect::From(gfx::Rect(0, 0, new_bounds.width, new_bounds.height)));
 }
 
 }  // namespace mandoline