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

chrome/browser/views/location_bar_view.cc

Index: chrome/browser/views/location_bar_view.cc
===================================================================
--- chrome/browser/views/location_bar_view.cc	(revision 10201)
+++ chrome/browser/views/location_bar_view.cc	(working copy)
@@ -200,8 +200,7 @@
 
 gfx::Size LocationBarView::GetPreferredSize() {
   return gfx::Size(0,
-      (popup_window_mode_ ? kPopupBackground : kBackground)->height() -
-      TopOffset());
+      (popup_window_mode_ ? kPopupBackground : kBackground)->height());
 }
 
 void LocationBarView::Layout() {
@@ -218,8 +217,7 @@
 
   const SkBitmap* background =
       popup_window_mode_ ? kPopupBackground : kBackground;
-  int top_offset = std::min(TopOffset(), height());
-  canvas->TileImageInt(*background, 0, top_offset, 0, 0, width(), height());
+  canvas->TileImageInt(*background, 0, 0, 0, 0, width(), height());
   int top_margin = TopMargin();
   canvas->FillRectInt(bg, 0, top_margin, width(),
                       std::max(height() - top_margin - kVertMargin, 0));
@@ -398,12 +396,8 @@
   }
 }
 
-int LocationBarView::TopOffset() const {
-  return (popup_window_mode_ && win_util::ShouldUseVistaFrame()) ? 1 : 0;
-}
-
 int LocationBarView::TopMargin() const {
-  return std::min(kVertMargin - TopOffset(), height());
+  return std::min(kVertMargin, height());
 }
 
 int LocationBarView::TextDisplayWidth() {