Completely rewrite OpaqueBrowserFrameViewLayout unittests.

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

 // Copyright 2013 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/opaque_browser_frame_view_layout.h"
 
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 
 namespace {
 
-// Besides the frame border, there's empty space atop the window in restored
-// mode, to use to drag the window around.
-const int kNonClientRestoredExtraThickness = 11;
-
 // The titlebar never shrinks too short to show the caption button plus some
 // padding below it.
 const int kCaptionButtonHeight = 18;
 const int kTitleBarAdditionalPadding = 3;
 
-// There is a 5 px gap between the title text and the caption buttons.
-const int kTitleLogoSpacing = 5;
-
-// The frame border is only visible in restored mode and is hardcoded to 4 px on
-// each side regardless of the system window border size.
-const int kFrameBorderThickness = 4;
-
-// The titlebar has a 2 px 3D edge along the top and bottom.
-const int kTitlebarTopAndBottomEdgeThickness = 2;
-
-// The icon is inset 2 px from the left frame border.
-const int kIconLeftSpacing = 2;
-
-// There is a 4 px gap between the icon and the title text.
-const int kIconTitleSpacing = 4;
-
-// How far the new avatar button is from the closest caption button.
-const int kNewAvatarButtonOffset = 5;
-
-// When the title bar is in its normal two row mode (usually the case for
-// restored windows), the New Tab button isn't at the same height as the caption
-// buttons, but the space will look cluttered if it actually slides under them,
-// so we stop it when the gap between the two is down to 5 px.
-const int kNewTabCaptionNormalSpacing = 5;
-
-// When the title bar is condensed to one row (as when maximized), the New Tab
-// button and the caption buttons are at similar vertical coordinates, so we
-// need to reserve a larger, 16 px gap to avoid looking too cluttered.
-const int kNewTabCaptionCondensedSpacing = 16;
-
-// If there are no caption buttons to the right of the New Tab button, we
-// reserve a small 5px gap, regardless of whether the window is maximized. This
-// overrides the two previous constants.
-const int kNewTabNoCaptionButtonsSpacing = 5;
-
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 // Default extra space between the top of the frame and the top of the window
 // caption buttons.
 const int kExtraCaption = 2;
 
 // Default extra spacing between individual window caption buttons.
 const int kCaptionButtonSpacing = 2;
 #else
 const int kExtraCaption = 0;
 const int kCaptionButtonSpacing = 0;
 #endif
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, public:
 
+// statics
+
+// Besides the frame border, there's empty space atop the window in restored
+// mode, to use to drag the window around.
+const int OpaqueBrowserFrameViewLayout::kNonClientRestoredExtraThickness = 11;
+
+// The frame border is only visible in restored mode and is hardcoded to 4 px on
+// each side regardless of the system window border size.
+const int OpaqueBrowserFrameViewLayout::kFrameBorderThickness = 4;
+
+// The titlebar has a 2 px 3D edge along the top and bottom.
+const int OpaqueBrowserFrameViewLayout::kTitlebarTopAndBottomEdgeThickness = 2;
+
+// The icon is inset 2 px from the left frame border.
+const int OpaqueBrowserFrameViewLayout::kIconLeftSpacing = 2;
+
+// There is a 4 px gap between the icon and the title text.
+const int OpaqueBrowserFrameViewLayout::kIconTitleSpacing = 4;
+
+// The horizontal spacing to use in most cases when laying out things near the
+// caption button area.
+const int OpaqueBrowserFrameViewLayout::kCaptionSpacing = 5;
+
+// When the title bar is condensed to one row (as when maximized), the New Tab
+// button and the caption buttons are at similar vertical coordinates, so we
+// need to reserve a larger, 16 px gap to avoid looking too cluttered.
+const int OpaqueBrowserFrameViewLayout::kNewTabCaptionCondensedSpacing = 16;
+
+
 OpaqueBrowserFrameViewLayout::OpaqueBrowserFrameViewLayout(
     OpaqueBrowserFrameViewLayoutDelegate* delegate)
     : delegate_(delegate),
       leading_button_start_(0),
       trailing_button_start_(0),
       minimum_size_for_buttons_(0),
       has_leading_buttons_(false),
       has_trailing_buttons_(false),
       extra_caption_y_(kExtraCaption),
       window_caption_spacing_(kCaptionButtonSpacing),
@@ skipping 145 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, private:
 
 bool OpaqueBrowserFrameViewLayout::ShouldIncognitoIconBeOnRight() const {
   // The incognito should be shown either on the end of the left or the
   // beginning of the right, depending on which side has fewer buttons.
   return trailing_buttons_.size() < leading_buttons_.size();
 }
 
 int OpaqueBrowserFrameViewLayout::NewTabCaptionSpacing() const {
-  if (!has_trailing_buttons_)
-    return kNewTabNoCaptionButtonsSpacing;
-  return IsTitleBarCondensed() ?
-      kNewTabCaptionCondensedSpacing : kNewTabCaptionNormalSpacing;
+  return (has_trailing_buttons_ && IsTitleBarCondensed()) ?
+      kNewTabCaptionCondensedSpacing : kCaptionSpacing;
 }
 
 void OpaqueBrowserFrameViewLayout::LayoutWindowControls(views::View* host) {
   int caption_y = CaptionButtonY(false);
 
   // Keep a list of all buttons that we don't show.
   std::vector<views::FrameButton> buttons_not_shown;
   buttons_not_shown.push_back(views::FRAME_BUTTON_MAXIMIZE);
   buttons_not_shown.push_back(views::FRAME_BUTTON_MINIMIZE);
   buttons_not_shown.push_back(views::FRAME_BUTTON_CLOSE);
@@ skipping 61 matching lines @@
 
   if (should_show_icon)
     window_icon_->SetBoundsRect(window_icon_bounds_);
 
   if (window_title_) {
     window_title_->SetVisible(should_show_title);
     if (should_show_title) {
       window_title_->SetText(delegate_->GetWindowTitle());
 
       int text_width = std::max(
-          0, host->width() - trailing_button_start_ - kTitleLogoSpacing -
+          0, host->width() - trailing_button_start_ - kCaptionSpacing -
           leading_button_start_ - kIconTitleSpacing);
       window_title_->SetBounds(leading_button_start_ + kIconTitleSpacing,
                                window_icon_bounds_.y(),
                                text_width, window_icon_bounds_.height());
       leading_button_start_ += text_width + kIconTitleSpacing;
     }
   }
 
   if (use_hidden_icon_location) {
     if (has_leading_buttons_) {
       // There are window button icons on the left. Don't size the hidden window
       // icon that people can double click on to close the window.
       window_icon_bounds_ = gfx::Rect();
     } else {
       // We set the icon bounds to a small rectangle in the top leading corner
       // if there are no icons on the leading side.
       window_icon_bounds_ = gfx::Rect(
           frame_thickness + kIconLeftSpacing, frame_thickness, size, size);
     }
   }
 }
 
 void OpaqueBrowserFrameViewLayout::LayoutNewStyleAvatar(views::View* host) {
   if (!new_avatar_button_)
     return;
 
   int button_width = new_avatar_button_->GetPreferredSize().width();
-  int button_width_with_offset = button_width + kNewAvatarButtonOffset;
+  int button_width_with_offset = button_width + kCaptionSpacing;
 
   int button_x =
       host->width() - trailing_button_start_ - button_width_with_offset;
   int button_y = CaptionButtonY(!IsTitleBarCondensed());
 
   minimum_size_for_buttons_ += button_width_with_offset;
   trailing_button_start_ += button_width_with_offset;
 
   // In non-maximized mode, allow the new tab button to completely slide under
   // the avatar button.
   if (!IsTitleBarCondensed()) {
     trailing_button_start_ -=
-        GetLayoutSize(NEW_TAB_BUTTON).width() + kNewTabCaptionNormalSpacing;
+        GetLayoutSize(NEW_TAB_BUTTON).width() + kCaptionSpacing;
   }
 
   new_avatar_button_->SetBounds(button_x, button_y, button_width,
                                 kCaptionButtonHeight);
 }
 
 void OpaqueBrowserFrameViewLayout::LayoutIncognitoIcon(views::View* host) {
   const int old_button_size = leading_button_start_ + trailing_button_start_;
 
   // Any buttons/icon/title were laid out based on the frame border thickness,
@@ skipping 108 matching lines @@
   int extra_height = title_bar_condensed ? extra_caption_y_ : 0;
 
   switch (alignment) {
     case ALIGN_LEADING: {
       if (has_leading_buttons_)
         leading_button_start_ += window_caption_spacing_;
 
       // If we're the first button on the left and maximized, add width to the
       // right hand side of the screen.
       int extra_width = (title_bar_condensed && !has_leading_buttons_) ?
-        (kFrameBorderThickness -
-         views::NonClientFrameView::kFrameShadowThickness) : 0;
+          (kFrameBorderThickness -
+               views::NonClientFrameView::kFrameShadowThickness) :
+          0;
 
-      button->SetBounds(
-          leading_button_start_,
-          caption_y - extra_height,
-          button_size.width() + extra_width,
-          button_size.height() + extra_height);
+      button->SetBounds(leading_button_start_,
+                        caption_y - extra_height,
+                        button_size.width() + extra_width,
+                        button_size.height() + extra_height);
 
       leading_button_start_ += extra_width + button_size.width();
       minimum_size_for_buttons_ += extra_width + button_size.width();
       has_leading_buttons_ = true;
       break;
     }
     case ALIGN_TRAILING: {
       if (has_trailing_buttons_)
         trailing_button_start_ += window_caption_spacing_;
 
@@ skipping 111 matching lines @@
 
 void OpaqueBrowserFrameViewLayout::ViewAdded(views::View* host,
                                              views::View* view) {
   SetView(view->id(), view);
 }
 
 void OpaqueBrowserFrameViewLayout::ViewRemoved(views::View* host,
                                                views::View* view) {
   SetView(view->id(), nullptr);
 }