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

chrome/browser/views/frame/aero_glass_non_client_view.cc

 // Copyright (c) 2006-2008 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/views/frame/aero_glass_non_client_view.h"
 
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/client_view.h"
@@ skipping 253 matching lines @@
 
   SkBitmap otr_avatar_icon = browser_view_->GetOTRAvatarIcon();
   canvas->DrawBitmapInt(otr_avatar_icon, 0,
       (otr_avatar_icon.height() - otr_avatar_bounds_.height()) / 2,
       otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), 
       MirroredLeftPointForRect(otr_avatar_bounds_), otr_avatar_bounds_.y(),
       otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), false);
 }
 
 void AeroGlassNonClientView::PaintClientEdge(ChromeCanvas* canvas) {
+  // The client edges start below the toolbar upper corner images regardless
+  // of how tall the toolbar itself is.
   int client_area_top =
-      frame_->client_view()->y() + browser_view_->GetToolbarBounds().bottom();
+      frame_->client_view()->y() + browser_view_->GetToolbarBounds().y() +
+      resources_->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_LEFT)->height();
+
   gfx::Rect client_area_bounds = CalculateClientAreaBounds(width(), height());
-  // 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;
-
   int client_area_bottom =
       std::max(client_area_top, height() - NonClientBorderThickness());
   int client_area_height = client_area_bottom - client_area_top;
   SkBitmap* right = resources_->GetPartBitmap(FRAME_CLIENT_EDGE_RIGHT);
   canvas->TileImageInt(*right, client_area_bounds.right(), client_area_top,
                        right->width(), client_area_height);
 
   canvas->DrawBitmapInt(
       *resources_->GetPartBitmap(FRAME_CLIENT_EDGE_BOTTOM_RIGHT),
       client_area_bounds.right(), client_area_bottom);
@@ skipping 49 matching lines @@
 
 #if defined(GOOGLE_CHROME_BUILD)
     distributor_logo_ = ResourceBundle::GetSharedInstance().
         GetBitmapNamed(IDR_DISTRIBUTOR_LOGO);
 #endif
 
     initialized = true;
   }
 }