Misc. small changes in preparation for moving popup mode edge drawing.

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 24 matching lines @@
 const int kCaptionButtonSpacing = 0;
 #endif
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, public:
 
 // statics
 
+// The content edge images have a shadow built into them.
+const int OpaqueBrowserFrameViewLayout::kContentEdgeShadowThickness = 2;
+
 // 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 titlebar has a 2 px 3D edge along the top.
+const int OpaqueBrowserFrameViewLayout::kTitlebarTopEdgeThickness = 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;
@@ skipping 111 matching lines @@
   // 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::TitlebarBottomThickness(bool restored) const {
-  int thickness = kTitleBarAdditionalPadding;
-  // If there's a non-empty toolbar, it will render the bottom portion of the
-  // titlebar.
-  if (delegate_->IsToolbarVisible())
-    return thickness;
-  thickness += kTitlebarTopAndBottomEdgeThickness;
-  return (!restored && IsTitleBarCondensed()) ?
-      thickness : (thickness + views::NonClientFrameView::kClientEdgeThickness);
+  const int thickness =
+      kTitleBarAdditionalPadding + kContentEdgeShadowThickness;
+  return (delegate_->IsToolbarVisible() || !IsTitleBarCondensed() || restored)
+      ? (thickness + views::NonClientFrameView::kClientEdgeThickness)
+      : thickness;
 }
 
 int OpaqueBrowserFrameViewLayout::CaptionButtonY(bool restored) const {
   // Maximized buttons start at window top, since the window has no border. This
   // offset is for the image (the actual clickable bounds extend all the way to
   // the top to take Fitts' Law into account).
   const int frame = (!restored && IsTitleBarCondensed()) ?
       FrameBorderThickness(false) :
       views::NonClientFrameView::kFrameShadowThickness;
   return frame + extra_caption_y_;
@@ skipping 80 matching lines @@
 
     // Our frame border has a different "3D look" than Windows'.  Theirs has
     // a more complex gradient on the top that they push their icon/title
     // below; then the maximized window cuts this off and the icon/title are
     // centered in the remaining space.  Because the apparent shape of our
     // border is simpler, using the same positioning makes things look
     // 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.
     int unavailable_px_at_top = IsTitleBarCondensed() ?
-        frame_thickness : kTitlebarTopAndBottomEdgeThickness;
+        frame_thickness : kTitlebarTopEdgeThickness;
     // 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 above the icon, since the 3D edge (+ client edge, for
     // restored windows) below looks (to the eye) more like additional space
     // than does the 3D edge (or nothing at all, for maximized windows)
     // above; hence the +1.
     int y = unavailable_px_at_top + (NonClientTopBorderHeight(false) -
                                      unavailable_px_at_top - size -
                                      TitlebarBottomThickness(false) + 1) / 2;
 
@@ skipping 314 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);
 }