Unit test for BrowserViewLayout that does not depend on BrowserView

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 2012 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 "chrome/browser/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 43 matching lines @@
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/accelerator_table.h"
 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h"
 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
 #include "chrome/browser/ui/views/avatar_menu_button.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h"
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
+#include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h"
 #include "chrome/browser/ui/views/frame/contents_container.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/frame/instant_overlay_controller_views.h"
 #include "chrome/browser/ui/views/frame/overlay_container.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_views.h"
@@ skipping 173 matching lines @@
 // occur for "browser-fullscreen" and not for "tab-fullscreen" (which has a URL
 // for the tab entering fullscreen).
 bool UseImmersiveFullscreenForUrl(const GURL& url) {
   bool is_browser_fullscreen = url.is_empty();
   return is_browser_fullscreen && chrome::UseImmersiveFullscreen();
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
+
+// Delegate implementation for BrowserViewLayout. Usually just forwards calls
+// into BrowserView.
+class BrowserViewLayoutDelegateImpl : public BrowserViewLayoutDelegate {
+ public:
+  explicit BrowserViewLayoutDelegateImpl(BrowserView* browser_view)
+      : browser_view_(browser_view) {}
+  virtual ~BrowserViewLayoutDelegateImpl() {}
+
+  // BrowserViewLayoutDelegate overrides:
+  virtual bool DownloadShelfNeedsLayout() const OVERRIDE {
+    DownloadShelfView* download_shelf = browser_view_->download_shelf_.get();
+    // Re-layout the shelf either if it is visible or if its close animation
+    // is currently running.
+    return download_shelf &&
+           (download_shelf->IsShowing() || download_shelf->IsClosing());
+  }
+
+  virtual bool IsTabStripVisible() const OVERRIDE {
+    return browser_view_->IsTabStripVisible();
+  }
+
+  virtual gfx::Rect GetBoundsForTabStrip(
+      views::View* tab_strip) const OVERRIDE {
+    return browser_view_->frame()->GetBoundsForTabStrip(tab_strip);
+  }
+
+  virtual bool IsToolbarVisible() const OVERRIDE {
+    return browser_view_->IsToolbarVisible();
+  }
+
+  virtual bool IsBookmarkBarVisible() const OVERRIDE {
+    return browser_view_->IsBookmarkBarVisible();
+  }
+
+ private:
+  BrowserView* browser_view_;
+
+  DISALLOW_COPY_AND_ASSIGN(BrowserViewLayoutDelegateImpl);
+};
+
+///////////////////////////////////////////////////////////////////////////////
 // BookmarkExtensionBackground, private:
 // This object serves as the views::Background object which is used to layout
 // and paint the bookmark bar.
 class BookmarkExtensionBackground : public views::Background {
  public:
   BookmarkExtensionBackground(BrowserView* browser_view,
                               DetachableToolbarView* host_view,
                               Browser* browser);
 
   // View methods overridden from views:Background.
@@ skipping 168 matching lines @@
   // destroyed.
   if (jumplist_) {
     jumplist_->Terminate();
   }
 #endif
 
   // We destroy the download shelf before |browser_| to remove its child
   // download views from the set of download observers (since the observed
   // downloads can be destroyed along with |browser_| and the observer
   // notifications will call back into deleted objects).
-  download_shelf_.reset();
   BrowserViewLayout* browser_view_layout = GetBrowserViewLayout();
   if (browser_view_layout)
     browser_view_layout->set_download_shelf(NULL);
+  download_shelf_.reset();
 
   // The TabStrip attaches a listener to the model. Make sure we shut down the
   // TabStrip first so that it can cleanly remove the listener.
   if (tabstrip_) {
     tabstrip_->parent()->RemoveChildView(tabstrip_);
+    if (browser_view_layout)
+      browser_view_layout->set_tab_strip(NULL);
     delete tabstrip_;
     tabstrip_ = NULL;
   }
   // Child views maintain PrefMember attributes that point to
   // OffTheRecordProfile's PrefService which gets deleted by ~Browser.
   RemoveAllChildViews(true);
 
   // It is possible that we were forced-closed by the native view system and
   // that tabs remain in the browser. Close any such remaining tabs.
   while (browser_->tab_strip_model()->count())
@@ skipping 426 matching lines @@
 void BrowserView::RestoreFocus() {
   WebContents* selected_web_contents = GetActiveWebContents();
   if (selected_web_contents)
     selected_web_contents->GetView()->RestoreFocus();
 }
 
 void BrowserView::SetWindowSwitcherButton(views::Button* button) {
   if (window_switcher_button_)
     RemoveChildView(window_switcher_button_);
   window_switcher_button_ = button;
+  GetBrowserViewLayout()->set_window_switcher_button(button);
   AddChildView(button);
 }
 
 void BrowserView::ToolbarSizeChanged(bool is_animating) {
   // The call to InfoBarContainer::SetMaxTopArrowHeight() below can result in
   // reentrancy; |call_state| tracks whether we're reentrant.  We can't just
   // early-return in this case because we need to layout again so the infobar
   // container's bounds are set correctly.
   static CallState call_state = NORMAL;
 
@@ skipping 900 matching lines @@
 const char* BrowserView::GetClassName() const {
   return kViewClassName;
 }
 
 void BrowserView::Layout() {
   if (ignore_layout_)
     return;
 
   views::View::Layout();
 
+  // TODO(jamescook): Why was this in the middle of layout code?
+  toolbar_->location_bar()->SetLocationEntryFocusable(IsToolbarVisible());
+
   // The status bubble position requires that all other layout finish first.
   LayoutStatusBubble();
 }
 
 void BrowserView::PaintChildren(gfx::Canvas* canvas) {
   // Paint the |infobar_container_| last so that it may paint its
   // overlapping tabs.
   for (int i = 0; i < child_count(); ++i) {
     View* child = child_at(i);
     if (child != infobar_container_)
@@ skipping 39 matching lines @@
       accelerator_table_.find(accelerator);
   DCHECK(iter != accelerator_table_.end());
   int command_id = iter->second;
 
   chrome::BrowserCommandController* controller = browser_->command_controller();
   if (!controller->block_command_execution())
     UpdateAcceleratorMetrics(accelerator, command_id);
   return chrome::ExecuteCommand(browser_.get(), command_id);
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// BrowserView, private
-
 SkColor BrowserView::GetInfoBarSeparatorColor() const {
   // NOTE: Keep this in sync with ToolbarView::OnPaint()!
   return (IsTabStripVisible() || !frame_->ShouldUseNativeFrame()) ?
       ThemeProperties::GetDefaultColor(
           ThemeProperties::COLOR_TOOLBAR_SEPARATOR) :
       SK_ColorBLACK;
 }
 
 void BrowserView::InfoBarContainerStateChanged(bool is_animating) {
   ToolbarSizeChanged(is_animating);
@@ skipping 96 matching lines @@
   toolbar_->Init();
 
   overlay_container_ = new OverlayContainer(this);
   overlay_container_->SetVisible(false);
   AddChildView(overlay_container_);
 
   overlay_controller_.reset(
       new InstantOverlayControllerViews(browser(), overlay_container_));
 
   BrowserViewLayout* browser_view_layout = new BrowserViewLayout;
-  browser_view_layout->Init(browser(),
+  browser_view_layout->Init(new BrowserViewLayoutDelegateImpl(this),
+                            browser(),
                             this,
+                            top_container_,
+                            tabstrip_,
+                            toolbar_,
                             infobar_container_,
                             contents_split_,
                             contents_container_,
-                            overlay_container_);
+                            overlay_container_,
+                            immersive_mode_controller_.get());
   SetLayoutManager(browser_view_layout);
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Create a custom JumpList and add it to an observer of TabRestoreService
   // so we can update the custom JumpList when a tab is added or removed.
   if (JumpList::Enabled()) {
     load_complete_listener_.reset(new LoadCompleteListener(this));
   }
 #endif
 
@@ skipping 666 matching lines @@
     // The +1 in the next line creates a 1-px gap between icon and arrow tip.
     gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() -
         LocationBarView::kIconInternalPadding + 1);
     ConvertPointToTarget(location_icon_view, this, &icon_bottom);
     gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
     ConvertPointToTarget(infobar_container_, this, &infobar_top);
     top_arrow_height = infobar_top.y() - icon_bottom.y();
   }
   return top_arrow_height;
 }