Fix some issues with the omnibox2 popup:...

chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc

 // Copyright (c) 2009 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/autocomplete/autocomplete_popup_contents_view.h"
 
 #include <dwmapi.h>
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/color_utils.h"
@@ skipping 21 matching lines @@
 static const SkColor kTextColor =
     color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
 static const SkColor kSelectedTextColor =
     color_utils::GetSysSkColor(COLOR_HIGHLIGHTTEXT);
 static const SkColor kDimTextColor =
     color_utils::GetSysSkColor(COLOR_GRAYTEXT);
 static const SkColor kSelectedDimTextColor =
     color_utils::GetSysSkColor(COLOR_HIGHLIGHTTEXT);
 static const SkColor kStandardURLColor = SkColorSetRGB(0, 0x80, 0);
 static const SkColor kHighlightURLColor = SkColorSetRGB(0xD0, 0xFF, 0xD0);
-static const int kPopupTransparency = 235;
+static const int kGlassPopupTransparency = 240;

[Peter Kasting, 2009/05/12 22:17:42]

I don't understand.  Why did you make this 240?  245 was better.  255 would have
been even better.  I was trying to say that I don't see what being slightly
transparent buys you and you responded by making it more transparent.  If you
MUST keep this code please make it 245.  Or 250.  Or 254.

+static const int kOpaquePopupTransparency = 255;
 static const int kHoverRowAlpha = 0x40;
 // The minimum distance between the top and bottom of the icon and the top or
 // bottom of the row. "Minimum" is used because the vertical padding may be
 // larger, depending on the size of the text.
 static const int kIconVerticalPadding = 2;
 // The minimum distance between the top and bottom of the text and the top or
 // bottom of the row. See comment about the use of "minimum" for
 // kIconVerticalPadding.
 static const int kTextVerticalPadding = 3;
 // The padding at the left edge of the row, left of the icon.
 static const int kRowLeftPadding = 6;
 // The padding on the right edge of the row, right of the text.
 static const int kRowRightPadding = 3;
 // The horizontal distance between the right edge of the icon and the left edge
 // of the text.
 static const int kIconTextSpacing = 9;
+// The size delta between the font used for the edit and the result rows. Passed
+// to ChromeFont::DeriveFont.
+static const int kEditFontAdjust = -1;
 
 class AutocompleteResultView : public views::View {
  public:
   AutocompleteResultView(AutocompleteResultViewModel* model,
                          int model_index,
                          const ChromeFont& font);
   virtual ~AutocompleteResultView();
 
   // Overridden from views::View:
   virtual void Paint(ChromeCanvas* canvas);
@@ skipping 574 matching lines @@
 AutocompletePopupContentsView::AutocompletePopupContentsView(
     const ChromeFont& font,
     AutocompleteEditViewWin* edit_view,
     AutocompleteEditModel* edit_model,
     Profile* profile,
     AutocompletePopupPositioner* popup_positioner)
     : popup_(new AutocompletePopupWin(this)),
       model_(new AutocompletePopupModel(this, edit_model, profile)),
       edit_view_(edit_view),
       popup_positioner_(popup_positioner),
-      edit_font_(font) {
+      result_font_(font.DeriveFont(kEditFontAdjust)) {
   set_border(new PopupBorder);
 }
 
 void AutocompletePopupContentsView::UpdateResultViewsFromResult(
     const AutocompleteResult& result) {
   RemoveAllChildViews(true);
   for (size_t i = 0; i < result.size(); ++i)
-    AddChildView(new AutocompleteResultView(this, i, edit_font_));
+    AddChildView(new AutocompleteResultView(this, i, result_font_));
   Layout();
 }
 
 gfx::Rect AutocompletePopupContentsView::GetPopupBounds() const {
   gfx::Insets insets;
   border()->GetInsets(&insets);
   gfx::Rect contents_bounds = popup_positioner_->GetPopupBounds();
   int child_count = GetChildViewCount();
   int height = 0;
   for (int i = 0; i < child_count; ++i)
@@ skipping 175 matching lines @@
   ScopedGDIObject<HRGN> popup_region;
   popup_region.Set(contents_path.CreateHRGN());
   bb.hRgnBlur = popup_region.Get();
   DwmEnableBlurBehindWindow(GetWidget()->GetNativeView(), &bb);
 }
 
 void AutocompletePopupContentsView::MakeCanvasTransparent(
     ChromeCanvas* canvas) {
   // Allow the window blur effect to show through the popup background.
   SkPaint paint;
-  paint.setColor(SkColorSetARGB(kPopupTransparency, 255, 255, 255));
+  SkColor transparency = win_util::ShouldUseVistaFrame() ?
+      kGlassPopupTransparency : kOpaquePopupTransparency;
+  paint.setColor(SkColorSetARGB(transparency, 255, 255, 255));
   paint.setPorterDuffXfermode(SkPorterDuff::kDstIn_Mode);
   paint.setStyle(SkPaint::kFill_Style);
   canvas->FillRectInt(0, 0, canvas->getDevice()->width(),
                       canvas->getDevice()->height(), paint);
 }