Add a debug view to the browser that allows various navigation features to be used.

mash/browser/browser.cc

 // Copyright 2016 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 "mash/browser/browser.h"
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_client.h"
+#include "mash/browser/debug_view.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "mojo/public/c/system/main.h"
 #include "services/navigation/public/interfaces/view.mojom.h"
 #include "services/shell/public/cpp/application_runner.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
 #include "ui/aura/mus/mus_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/paint_throbber.h"
@@ skipping 97 matching lines @@
      navigation::mojom::ViewPtr view,
      navigation::mojom::ViewClientRequest request)
       : browser_(browser),
         type_(type),
         back_button_(new views::LabelButton(this, base::ASCIIToUTF16("Back"))),
         forward_button_(
             new views::LabelButton(this, base::ASCIIToUTF16("Forward"))),
         reload_button_(
             new views::LabelButton(this, base::ASCIIToUTF16("Reload"))),
         prompt_(new views::Textfield),
+        debug_button_(
+            new views::LabelButton(this, base::ASCIIToUTF16("DV"))),
         throbber_(new Throbber),
         progress_bar_(new ProgressBar),
+        debug_view_(new DebugView),
         view_(std::move(view)),
         view_client_binding_(this, std::move(request)) {
     set_background(views::Background::CreateStandardPanelBackground());
     prompt_->set_controller(this);
     back_button_->set_request_focus_on_press(false);
     forward_button_->set_request_focus_on_press(false);
     reload_button_->set_request_focus_on_press(false);
     AddChildView(back_button_);
     AddChildView(forward_button_);
     AddChildView(reload_button_);
     AddChildView(prompt_);
+    AddChildView(debug_button_);
     AddChildView(throbber_);
     AddChildView(progress_bar_);
+    AddChildView(debug_view_);
+    debug_view_->set_view(view_.get());
   }
   ~UI() override { browser_->RemoveWindow(GetWidget()); }
 
   void NavigateTo(const GURL& url) { view_->NavigateTo(url); }
 
  private:
   // Overridden from views::WidgetDelegate:
   views::View* GetContentsView() override { return this; }
   base::string16 GetWindowTitle() const override {
     // TODO(beng): use resources.
@@ skipping 13 matching lines @@
     if (sender == back_button_) {
       view_->GoBack();
     } else if (sender == forward_button_) {
       view_->GoForward();
     } else if (sender == reload_button_) {
       if (is_loading_)
         view_->Stop();
       else
         view_->Reload(false);
     }
+    else if (sender == debug_button_) {

[sky, 2016/06/03 22:24:50]

nit: else on previous line.

+      ToggleDebugView();
+    }
   }
 
   // Overridden from views::View:
   void Layout() override {
     gfx::Rect local_bounds = GetLocalBounds();
     gfx::Rect bounds = local_bounds;
     bounds.Inset(5, 5);
 
     gfx::Size ps = back_button_->GetPreferredSize();
     back_button_->SetBoundsRect(
         gfx::Rect(bounds.x(), bounds.y(), ps.width(), ps.height()));
     ps = forward_button_->GetPreferredSize();
     forward_button_->SetBoundsRect(gfx::Rect(back_button_->bounds().right() + 5,
                                              bounds.y(), ps.width(),
                                              ps.height()));
     ps = reload_button_->GetPreferredSize();
     reload_button_->SetBoundsRect(
         gfx::Rect(forward_button_->bounds().right() + 5, bounds.y(), ps.width(),
                   ps.height()));
 
     ps = prompt_->GetPreferredSize();
+    int throbber_size = ps.height();
+    gfx::Size debug_ps = debug_button_->GetPreferredSize();
     int prompt_y =
         bounds.y() + (reload_button_->bounds().height() - ps.height()) / 2;
     int width =
-        bounds.width() - reload_button_->bounds().right() - ps.height() - 10;
+        bounds.width() - reload_button_->bounds().right() - throbber_size - 15 -
+        debug_ps.width();
     prompt_->SetBoundsRect(gfx::Rect(reload_button_->bounds().right() + 5,
                                      prompt_y, width, ps.height()));
-    throbber_->SetBoundsRect(gfx::Rect(prompt_->bounds().right() + 5,
-                                       prompt_->bounds().y(), ps.height(),
-                                       ps.height()));
+
+    debug_button_->SetBoundsRect(
+        gfx::Rect(prompt_->bounds().right() + 5,
+                  prompt_->bounds().y(), debug_ps.width(), debug_ps.height()));
+
+    throbber_->SetBoundsRect(gfx::Rect(debug_button_->bounds().right() + 5,
+                                       prompt_->bounds().y(), throbber_size,
+                                       throbber_size));
 
     gfx::Rect progress_bar_rect(local_bounds.x(),
                                 back_button_->bounds().bottom() + 5,
                                 local_bounds.width(), 2);
     progress_bar_->SetBoundsRect(progress_bar_rect);
 
+    int debug_view_height = 0;
+    if (showing_debug_view_)
+      debug_view_height = debug_view_->GetPreferredSize().height();
+    debug_view_->SetBoundsRect(
+        gfx::Rect(local_bounds.x(), local_bounds.height() - debug_view_height,
+                  local_bounds.width(), debug_view_height));
+
     if (content_area_) {
       int x = local_bounds.x();
       int y = type_ == Type::POPUP ? 0 : progress_bar_->bounds().bottom();
       gfx::Point offset(x, y);
       ConvertPointToWidget(this, &offset);
       int width = local_bounds.width();
-      int height = local_bounds.height() - y;
+      int height = local_bounds.height() - y - debug_view_height;
       content_area_->SetBounds(
           gfx::Rect(offset.x(), offset.y(), width, height));
     }
   }
   void ViewHierarchyChanged(
       const views::View::ViewHierarchyChangedDetails& details) override {
     if (details.is_add && GetWidget() && !content_area_) {
       mus::Window* window = aura::GetMusWindow(GetWidget()->GetNativeWindow());
       content_area_ = window->window_tree()->NewWindow(nullptr);
       window->AddChild(content_area_);
@@ skipping 49 matching lines @@
                    bool user_gesture) override {
     views::Widget* window = views::Widget::CreateWindowWithContextAndBounds(
         new UI(browser_, is_popup ? UI::Type::POPUP : UI::Type::WINDOW,
                std::move(view), std::move(request)),
         nullptr, initial_rect);
     window->Show();
     browser_->AddWindow(window);
   }
   void Close() override { GetWidget()->Close(); }
 
+  void ToggleDebugView() {
+    showing_debug_view_ = !showing_debug_view_;
+    Layout();
+  }
+
   Browser* browser_;
 
   Type type_;
 
   views::LabelButton* back_button_;
   views::LabelButton* forward_button_;
   views::LabelButton* reload_button_;
   views::Textfield* prompt_;
+  views::LabelButton* debug_button_;
   Throbber* throbber_;
   ProgressBar* progress_bar_;
 
   mus::Window* content_area_ = nullptr;
 
+  DebugView* debug_view_;
+
   navigation::mojom::ViewPtr view_;
   mojo::Binding<navigation::mojom::ViewClient> view_client_binding_;
 
   bool is_loading_ = false;
   base::string16 current_title_;
 
+  bool showing_debug_view_ = false;
+
   DISALLOW_COPY_AND_ASSIGN(UI);
 };
 
 Browser::Browser() {}
 Browser::~Browser() {}
 
 void Browser::AddWindow(views::Widget* window) {
   windows_.push_back(window);
 }
 
@@ skipping 44 matching lines @@
   AddWindow(window);
 }
 
 void Browser::Create(shell::Connection* connection,
                      mojom::LaunchableRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace browser
 }  // namespace mash