Make TOOLKIT_VIEWS port use views-based Autocomplete 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 <objidl.h>
-#include <commctrl.h>
-#include <dwmapi.h>
-
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
 #include "app/gfx/insets.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
-#include "app/win_util.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
+#include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
-#include "chrome/browser/views/autocomplete/autocomplete_popup_win.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/icu38/public/common/unicode/ubidi.h"
 #include "views/widget/widget.h"
 
+#if defined(OS_WIN)
+#include <objidl.h>
+#include <commctrl.h>
+#include <dwmapi.h>
+
+#include "app/win_util.h"
+#include "chrome/browser/views/autocomplete/autocomplete_popup_win.h"
+#else
+#include "chrome/browser/views/autocomplete/autocomplete_popup_gtk.h"
+#endif
+
 // Colors for various components of the view.
+#if defined(OS_WIN)
 static const SkColor kBackgroundColor =
     color_utils::GetSysSkColor(COLOR_WINDOW);
 static const SkColor kSelectedBackgroundColor =
     color_utils::GetSysSkColor(COLOR_HIGHLIGHT);
 static const SkColor kHoverBackgroundColor =
     SkColorSetA(kSelectedBackgroundColor, 127);
 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);
+#else
+// TODO(beng): source from theme provider.
+static const SkColor kBackgroundColor = SK_ColorWHITE;
+static const SkColor kSelectedBackgroundColor = SK_ColorBLUE;
+static const SkColor kHoverBackgroundColor = SK_ColorCYAN;
+static const SkColor kTextColor = SK_ColorBLACK;
+static const SkColor kSelectedTextColor = SK_ColorWHITE;
+static const SkColor kDimTextColor = SK_ColorGRAY;
+static const SkColor kSelectedDimTextColor = SK_ColorWHITE;
+#endif
 static const SkColor kStandardURLColor = SkColorSetRGB(0, 0x80, 0);
 static const SkColor kHighlightURLColor = SkColorSetRGB(0xD0, 0xFF, 0xD0);
 static const int kGlassPopupTransparency = 240;
 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
@@ skipping 596 matching lines @@
     dropshadow_bottomleft_ = rb.GetBitmapNamed(IDR_OMNIBOX_POPUP_DS_BL);
     initialized = true;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, public:
 
 AutocompletePopupContentsView::AutocompletePopupContentsView(
     const gfx::Font& font,
-    AutocompleteEditViewWin* edit_view,
+    AutocompleteEditView* edit_view,
     AutocompleteEditModel* edit_model,
     Profile* profile,
     AutocompletePopupPositioner* popup_positioner)
+#if defined(OS_WIN)
     : popup_(new AutocompletePopupWin(this)),
+#else
+    : popup_(new AutocompletePopupGtk(this)),
+#endif
       model_(new AutocompletePopupModel(this, edit_model, profile)),
       edit_view_(edit_view),
       popup_positioner_(popup_positioner),
       result_font_(font.DeriveFont(kEditFontAdjust)),
       ALLOW_THIS_IN_INITIALIZER_LIST(size_animation_(this)) {
   set_border(new PopupBorder);
 }
 
 gfx::Rect AutocompletePopupContentsView::GetPopupBounds() const {
   if (!size_animation_.IsAnimating())
     return target_bounds_;
 
   gfx::Rect current_frame_bounds = start_bounds_;
   int total_height_delta = target_bounds_.height() - start_bounds_.height();
   // Round |current_height_delta| instead of truncating so we won't leave single
   // white pixels at the bottom of the popup as long when animating very small
   // height differences.
   int current_height_delta = static_cast<int>(
       size_animation_.GetCurrentValue() * total_height_delta - 0.5);
   current_frame_bounds.set_height(
       current_frame_bounds.height() + current_height_delta);
   return current_frame_bounds;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, AutocompletePopupView overrides:
 
 bool AutocompletePopupContentsView::IsOpen() const {
-  return popup_->IsWindow() && popup_->IsVisible();
+  return popup_->IsOpen();
 }
 
 void AutocompletePopupContentsView::InvalidateLine(size_t line) {
   GetChildViewAt(static_cast<int>(line))->SchedulePaint();
 }
 
 void AutocompletePopupContentsView::UpdatePopupAppearance() {
   if (model_->result().empty()) {
     // No matches, close any existing popup.
-    if (popup_->IsWindow()) {
+    if (popup_->IsCreated()) {
       size_animation_.Stop();
       popup_->Hide();
     }
     return;
   }
 
   // Update the match cached by each row, in the process of doing so make sure
   // we have enough row views.
   int total_child_height = 0;
   size_t child_view_count = GetChildViewCount();
@@ skipping 18 matching lines @@
                           -insets.bottom());
 
   // If we're animating and our target height changes, reset the animation.
   // NOTE: If we just reset blindly on _every_ update, then when the user types
   // rapidly we could get "stuck" trying repeatedly to animate shrinking by the
   // last few pixels to get to one visible result.
   if (new_target_bounds.height() != target_bounds_.height())
     size_animation_.Reset();
   target_bounds_ = new_target_bounds;
 
-  if (!popup_->IsWindow()) {
+  if (!popup_->IsCreated()) {
     // If we've never been shown, we need to create the window.
     popup_->Init(edit_view_, this);
   } else {
     // Animate the popup shrinking, but don't animate growing larger (or
     // appearing for the first time) since that would make the popup feel less
     // responsive.
     GetWidget()->GetBounds(&start_bounds_, true);
     if (popup_->IsVisible() &&
         (target_bounds_.height() < start_bounds_.height()))
       size_animation_.Show();
@@ skipping 137 matching lines @@
   rect.set(SkIntToScalar(bounding_rect.x()),
            SkIntToScalar(bounding_rect.y()),
            SkIntToScalar(bounding_rect.right()),
            SkIntToScalar(bounding_rect.bottom()));
 
   SkScalar radius = SkIntToScalar(PopupBorder::GetBorderRadius());
   path->addRoundRect(rect, radius, radius);
 }
 
 void AutocompletePopupContentsView::UpdateBlurRegion() {
+#if defined(OS_WIN)
   // We only support background blurring on Vista with Aero-Glass enabled.
   if (!win_util::ShouldUseVistaFrame() || !GetWidget())
     return;
 
   // Provide a blurred background effect within the contents region of the
   // popup.
   DWM_BLURBEHIND bb = {0};
   bb.dwFlags = DWM_BB_ENABLE | DWM_BB_BLURREGION;
   bb.fEnable = true;
 
   // Translate the contents rect into widget coordinates, since that's what
   // DwmEnableBlurBehindWindow expects a region in.
   gfx::Rect contents_rect = GetLocalBounds(false);
   gfx::Point origin(contents_rect.origin());
   views::View::ConvertPointToWidget(this, &origin);
   contents_rect.set_origin(origin);
 
   gfx::Path contents_path;
   MakeContentsPath(&contents_path, contents_rect);
   ScopedGDIObject<HRGN> popup_region;
   popup_region.Set(contents_path.CreateHRGN());
   bb.hRgnBlur = popup_region.Get();
   DwmEnableBlurBehindWindow(GetWidget()->GetNativeView(), &bb);
+#endif
 }
 
 void AutocompletePopupContentsView::MakeCanvasTransparent(
     gfx::Canvas* canvas) {
   // Allow the window blur effect to show through the popup background.
   SkPaint paint;
   SkColor transparency = GetThemeProvider()->ShouldUseNativeFrame() ?
       kGlassPopupTransparency : kOpaquePopupTransparency;
   paint.setColor(SkColorSetARGB(transparency, 255, 255, 255));
   paint.setXfermodeMode(SkXfermode::kDstIn_Mode);
   paint.setStyle(SkPaint::kFill_Style);
   canvas->FillRectInt(0, 0, canvas->getDevice()->width(),
                       canvas->getDevice()->height(), paint);
 }
+
+// static
+AutocompletePopupView* AutocompletePopupView::CreatePopupView(
+    const gfx::Font& font,
+    AutocompleteEditView* edit_view,
+    AutocompleteEditModel* edit_model,
+    Profile* profile,
+    AutocompletePopupPositioner* popup_positioner) {
+  return new AutocompletePopupContentsView(font, edit_view, edit_model,
+                                           profile, popup_positioner);
+}