Make non-glass popups match new mockup from Glen....

chrome/browser/views/frame/opaque_non_client_view.cc

Index: chrome/browser/views/frame/opaque_non_client_view.cc
===================================================================
--- chrome/browser/views/frame/opaque_non_client_view.cc	(revision 10201)
+++ chrome/browser/views/frame/opaque_non_client_view.cc	(working copy)
@@ -61,10 +61,6 @@
   FRAME_NO_TOOLBAR_TOP_CENTER,
   FRAME_NO_TOOLBAR_TOP_RIGHT,
 
-  // Popup-mode toolbar edges.
-  FRAME_TOOLBAR_POPUP_EDGE_LEFT,
-  FRAME_TOOLBAR_POPUP_EDGE_RIGHT,
-
   FRAME_PART_BITMAP_COUNT  // Must be last.
 };
 
@@ -99,7 +95,6 @@
             IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
             IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
         IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
-        IDR_LOCATIONBG_POPUPMODE_LEFT, IDR_LOCATIONBG_POPUPMODE_RIGHT,
       };
 
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ -145,7 +140,6 @@
             IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
             IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
         IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
-        IDR_LOCATIONBG_POPUPMODE_LEFT, IDR_LOCATIONBG_POPUPMODE_RIGHT,
       };
 
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ -191,7 +185,6 @@
             IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
             IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
         IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
-        IDR_LOCATIONBG_POPUPMODE_LEFT, IDR_LOCATIONBG_POPUPMODE_RIGHT,
       };
 
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ -238,7 +231,6 @@
             IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
             IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
         IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
-        IDR_LOCATIONBG_POPUPMODE_LEFT, IDR_LOCATIONBG_POPUPMODE_RIGHT,
       };
 
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ -482,7 +474,7 @@
       browser_view_->GetTabStripHeight() : 0;
   gfx::Point system_menu_point(FrameBorderThickness(),
       NonClientTopBorderHeight() + tabstrip_height -
-      BottomEdgeThicknessWithinNonClientHeight());
+      UnavailablePixelsAtBottomOfNonClientHeight());
   ConvertPointToScreen(this, &system_menu_point);
   return system_menu_point;
 }
@@ -696,9 +688,14 @@
       0 : kNonClientRestoredExtraThickness);
 }
 
-int OpaqueNonClientView::BottomEdgeThicknessWithinNonClientHeight() const {
+int OpaqueNonClientView::UnavailablePixelsAtBottomOfNonClientHeight() const {
+  // Tricky: When a toolbar is edging the titlebar, it not only draws its own
+  // shadow and client edge, but an extra, light "shadow" pixel as well, which
+  // is treated as available space.  Thus the nonclient area actually _fails_ to
+  // include some available pixels, leading to a negative number here.
   if (browser_view_->IsToolbarVisible())
-    return 0;
+    return -kFrameShadowThickness;
+
   return kFrameShadowThickness +
       (frame_->IsMaximized() ? 0 : kClientEdgeThickness);
 }
@@ -727,7 +724,7 @@
   *title_thickness = std::max(title_font_.height(),
       min_titlebar_height - *title_top_spacing - title_bottom_spacing);
   return *title_top_spacing + *title_thickness + title_bottom_spacing +
-      BottomEdgeThicknessWithinNonClientHeight();
+      UnavailablePixelsAtBottomOfNonClientHeight();
 }
 
 void OpaqueNonClientView::PaintRestoredFrameBorder(ChromeCanvas* canvas) {
@@ -823,28 +820,34 @@
 void OpaqueNonClientView::PaintToolbarBackground(ChromeCanvas* canvas) {
   if (!browser_view_->IsToolbarVisible())
     return;
-  
+
   gfx::Rect toolbar_bounds(browser_view_->GetToolbarBounds());
   gfx::Point toolbar_origin(toolbar_bounds.origin());
   View::ConvertPointToView(frame_->client_view(), this, &toolbar_origin);
   toolbar_bounds.set_origin(toolbar_origin);
 
-  bool normal_mode = browser_view_->IsToolbarDisplayModeNormal();
-  SkBitmap* toolbar_left = resources()->GetPartBitmap(normal_mode ?
-      FRAME_CLIENT_EDGE_TOP_LEFT : FRAME_TOOLBAR_POPUP_EDGE_LEFT);
+  SkBitmap* toolbar_left =
+      resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_LEFT);
   canvas->DrawBitmapInt(*toolbar_left,
                         toolbar_bounds.x() - toolbar_left->width(),
                         toolbar_bounds.y());
 
-  if (normal_mode) {
-    SkBitmap* toolbar_center =
-        resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP);
-    canvas->TileImageInt(*toolbar_center, toolbar_bounds.x(),
-        toolbar_bounds.y(), toolbar_bounds.width(), toolbar_center->height());
-  }
+  // Gross hack: We split the toolbar image into two pieces, since sometimes
+  // (popup mode) the toolbar isn't tall enough to show the whole image.  The
+  // split happens between the top shadow section and the bottom gradient
+  // section so that we never break the gradient.
+  int split_point = kFrameShadowThickness * 2;
+  SkBitmap* toolbar_center =
+      resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP);
+  canvas->TileImageInt(*toolbar_center, 0, 0, toolbar_bounds.x(),
+      toolbar_bounds.y(), toolbar_bounds.width(), split_point);
+  canvas->TileImageInt(*toolbar_center, 0,
+      toolbar_center->height() - toolbar_bounds.height() + split_point,
+      toolbar_bounds.x(), toolbar_bounds.y() + split_point,
+      toolbar_bounds.width(), toolbar_bounds.height() - split_point);
 
-  canvas->DrawBitmapInt(*resources()->GetPartBitmap(normal_mode ?
-      FRAME_CLIENT_EDGE_TOP_RIGHT : FRAME_TOOLBAR_POPUP_EDGE_RIGHT),
+  canvas->DrawBitmapInt(
+      *resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_RIGHT),
       toolbar_bounds.right(), toolbar_bounds.y());
 }
 
@@ -861,23 +864,14 @@
 }
 
 void OpaqueNonClientView::PaintRestoredClientEdge(ChromeCanvas* canvas) {
-  int client_area_top =
-      frame_->client_view()->y() + browser_view_->GetToolbarBounds().bottom();
+  int client_area_top = frame_->client_view()->y();
 
   gfx::Rect client_area_bounds = CalculateClientAreaBounds(width(), height());
-  if (browser_view_->IsToolbarVisible() &&
-      browser_view_->IsToolbarDisplayModeNormal()) {
-    // The toolbar draws a client edge along its own bottom edge when it's
-    // visible and in normal mode.  However, it only draws this for the width of
-    // the actual client area, leaving a gap at the left and right edges:
-    //
-    // |             Toolbar             | <-- part of toolbar
-    //  ----- (toolbar client edge) -----  <-- gap
-    // |           Client area           | <-- right client edge
-    //
-    // To address this, we extend the left and right client edges up to fill the
-    // gap, by pretending the toolbar is shorter than it really is.
-    client_area_top -= kClientEdgeThickness;
+  if (browser_view_->IsToolbarVisible()) {
+    // The client edges start below the toolbar upper corner images regardless
+    // of how tall the toolbar itself is.
+    client_area_top += browser_view_->GetToolbarBounds().y() +
+        resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_LEFT)->height();
   } else {
     // The toolbar isn't going to draw a client edge for us, so draw one
     // ourselves.
@@ -997,7 +991,7 @@
   int title_top_spacing, title_thickness;
   int top_height = TitleCoordinates(&title_top_spacing, &title_thickness);
   int available_height = top_height - frame_thickness -
-      BottomEdgeThicknessWithinNonClientHeight();
+      UnavailablePixelsAtBottomOfNonClientHeight();
 
   // The icon takes up a constant fraction of the available height, down to a
   // minimum size, and is always an even number of pixels on a side (presumably