Refactored GlassBrowserFrameView and BrowserDesktopTreeHostWin.

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"
@@ skipping 101 matching lines @@
   available_width -= x + NewTabCaptionSpacing() + trailing_button_start_;
   return gfx::Rect(x, GetTabStripInsetsTop(false), std::max(0, available_width),
                    tabstrip_preferred_size.height());
 }
 
 gfx::Size OpaqueBrowserFrameViewLayout::GetMinimumSize(
     int available_width) const {
   gfx::Size min_size = delegate_->GetBrowserViewMinimumSize();
   int border_thickness = NonClientBorderThickness();
   min_size.Enlarge(2 * border_thickness,
-                   NonClientTopBorderHeight(false) + border_thickness);
+                   NonClientTopHeight(false) + border_thickness);
 
   // Ensure that we can, at minimum, hold our window controls and avatar icon.
   min_size.set_width(std::max(min_size.width(), minimum_size_for_buttons_));
 
   // Ensure that the minimum width is enough to hold a minimum width tab strip
   // at its usual insets.
   if (delegate_->IsTabStripVisible()) {
     gfx::Size preferred_size = delegate_->GetTabstripPreferredSize();
     const int min_tabstrip_width = preferred_size.width();
     const int caption_spacing = NewTabCaptionSpacing();
     min_size.Enlarge(min_tabstrip_width + caption_spacing, 0);
   }
 
   return min_size;
 }
 
 gfx::Rect OpaqueBrowserFrameViewLayout::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
-  int top_height = NonClientTopBorderHeight(false);
+  int top_height = NonClientTopHeight(false);
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(std::max(0, client_bounds.x() - border_thickness),
                    std::max(0, client_bounds.y() - top_height),
                    client_bounds.width() + (2 * border_thickness),
                    client_bounds.height() + top_height + border_thickness);
 }
 
 int OpaqueBrowserFrameViewLayout::FrameBorderThickness(bool restored) const {
   return (!restored && (IsTitleBarCondensed() || delegate_->IsFullscreen())) ?
       0 : kFrameBorderThickness;
 }
 
 int OpaqueBrowserFrameViewLayout::NonClientBorderThickness() const {
   const int frame = FrameBorderThickness(false);
   // When we fill the screen, we don't show a client edge.
   return (IsTitleBarCondensed() || delegate_->IsFullscreen()) ?
       frame : (frame + views::NonClientFrameView::kClientEdgeThickness);
 }
 
-int OpaqueBrowserFrameViewLayout::NonClientTopBorderHeight(
-    bool restored) const {
+int OpaqueBrowserFrameViewLayout::NonClientTopHeight(bool restored) const {
   if (delegate_->ShouldShowWindowTitle()) {
     // The + 2 here puts at least 1 px of space on top and bottom of the icon.
     const int icon_height =
         TitlebarTopThickness(restored) + delegate_->GetIconSize() + 2;
     const int caption_button_height = CaptionButtonY(restored) +
         kCaptionButtonHeight + kCaptionButtonBottomPadding;
     return std::max(icon_height, caption_button_height) +
         kContentEdgeShadowThickness;
   }
 
   int thickness = FrameBorderThickness(restored);
   // The tab top inset is equal to the height of any shadow region above the
   // tabs, plus a 1 px top stroke.  In maximized mode, we want to push the
   // shadow region off the top of the screen but leave the top stroke.
   if (!restored && delegate_->IsTabStripVisible() && IsTitleBarCondensed())
     thickness -= GetLayoutInsets(TAB).top() - 1;
   return thickness;
 }
 
 int OpaqueBrowserFrameViewLayout::GetTabStripInsetsTop(bool restored) const {
-  const int top = NonClientTopBorderHeight(restored);
+  const int top = NonClientTopHeight(restored);
   // Annoyingly, the pre-MD layout uses different heights for the hit-test
   // exclusion region (which we want here, since we're trying to size the border
   // so that the region above the tab's hit-test zone matches) versus the shadow
   // thickness.
   const int exclusion = GetLayoutConstant(TAB_TOP_EXCLUSION_HEIGHT);
   return (!restored && (IsTitleBarCondensed() || delegate_->IsFullscreen())) ?
       top : (top + kNonClientRestoredExtraThickness - exclusion);
 }
 
 int OpaqueBrowserFrameViewLayout::TitlebarTopThickness(bool restored) const {
@@ skipping 11 matching lines @@
   return frame + extra_caption_y_;
 }
 
 gfx::Rect OpaqueBrowserFrameViewLayout::IconBounds() const {
   return window_icon_bounds_;
 }
 
 gfx::Rect OpaqueBrowserFrameViewLayout::CalculateClientAreaBounds(
     int width,
     int height) const {
-  int top_height = NonClientTopBorderHeight(false);
+  int top_height = NonClientTopHeight(false);
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(border_thickness, top_height,
                    std::max(0, width - (2 * border_thickness)),
                    std::max(0, height - top_height - border_thickness));
 }
 
 bool OpaqueBrowserFrameViewLayout::IsTitleBarCondensed() const {
   // If there are no caption buttons, there is no need to have an uncondensed
   // title bar. If the window is maximized, the title bar is condensed
   // regardless of whether there are caption buttons.
@@ skipping 66 matching lines @@
     // slightly uncentered with restored windows, so when the window is
     // restored, instead of calculating the remaining space from below the
     // frame border, we calculate from below the 3D edge.
     const int unavailable_px_at_top = TitlebarTopThickness(false);
     // When the icon is shorter than the minimum space we reserve for the
     // caption button, we vertically center it.  We want to bias rounding to
     // put extra space below the icon, since we'll use the same Y coordinate for
     // the title, and the majority of the font weight is below the centerline.
     const int icon_height =
         unavailable_px_at_top + size + kContentEdgeShadowThickness;
-    const int y = unavailable_px_at_top +
-        (NonClientTopBorderHeight(false) - icon_height) / 2;
+    const int y =
+        unavailable_px_at_top + (NonClientTopHeight(false) - icon_height) / 2;
 
     window_icon_bounds_ = gfx::Rect(leading_button_start_ + kIconLeftSpacing, y,
                                     size, size);
     leading_button_start_ += size + kIconLeftSpacing;
     minimum_size_for_buttons_ += size + kIconLeftSpacing;
   }
 
   if (should_show_icon)
     window_icon_->SetBoundsRect(window_icon_bounds_);
 
@@ skipping 305 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);
 }