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

chrome/browser/views/location_bar_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/location_bar_view.h"
 
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
@@ skipping 182 matching lines @@
     profile_ = profile;
     location_entry_->model()->SetProfile(profile);
     selected_keyword_view_.set_profile(profile);
     keyword_hint_view_.set_profile(profile);
     security_image_view_.set_profile(profile);
   }
 }
 
 gfx::Size LocationBarView::GetPreferredSize() {
   return gfx::Size(0,
-      (popup_window_mode_ ? kPopupBackground : kBackground)->height() -
-      TopOffset());
+      (popup_window_mode_ ? kPopupBackground : kBackground)->height());
 }
 
 void LocationBarView::Layout() {
   DoLayout(true);
 }
 
 void LocationBarView::Paint(ChromeCanvas* canvas) {
   View::Paint(canvas);
 
   SkColor bg = SkColorSetRGB(
       GetRValue(kBackgroundColorByLevel[model_->GetSchemeSecurityLevel()]),
       GetGValue(kBackgroundColorByLevel[model_->GetSchemeSecurityLevel()]),
       GetBValue(kBackgroundColorByLevel[model_->GetSchemeSecurityLevel()]));
 
   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));
 }
 
 bool LocationBarView::CanProcessTabKeyEvents() {
   // We want to receive tab key events when the hint is showing.
   return keyword_hint_view_.IsVisible();
 }
 
@@ skipping 158 matching lines @@
                                   location_bounds.y(),
                                   location_bounds.width(),
                                   location_bounds.height());
   if (!force_layout) {
     // If force_layout is false and we got this far it means one of the views
     // was added/removed or changed in size. We need to paint ourselves.
     SchedulePaint();
   }
 }
 
-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() {
   POINT last_char_position =
       location_entry_->PosFromChar(location_entry_->GetTextLength());
   POINT scroll_position;
   location_entry_->GetScrollPos(&scroll_position);
   const int position_x = last_char_position.x + scroll_position.x;
   return UILayoutIsRightToLeft() ? width() - position_x : position_x;
 }
@@ skipping 588 matching lines @@
 }
 
 void LocationBarView::FocusSearch() {
   location_entry_->SetUserText(L"?");
   location_entry_->SetFocus();
 }
 
 void LocationBarView::SaveStateToContents(TabContents* contents) {
   location_entry_->SaveStateToTab(contents);
 }