Convert the AutocompletePopupPositioner into a BubblePositioner in preparatio...

chrome/browser/autocomplete/autocomplete_popup_view_gtk.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/autocomplete/autocomplete_popup_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/gfx/gtk_util.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
+#include "chrome/browser/bubble_positioner.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/gtk/rounded_window.h"
 #include "chrome/common/notification_service.h"
 #include "grit/theme_resources.h"
 
 namespace {
 
@@ skipping 202 matching lines @@
 
   return NULL;
 }
 
 }  // namespace
 
 AutocompletePopupViewGtk::AutocompletePopupViewGtk(
     AutocompleteEditView* edit_view,
     AutocompleteEditModel* edit_model,
     Profile* profile,
-    AutocompletePopupPositioner* popup_positioner)
+    const BubblePositioner* bubble_positioner)
     : model_(new AutocompletePopupModel(this, edit_model, profile)),
       edit_view_(edit_view),
-      popup_positioner_(popup_positioner),
+      bubble_positioner_(bubble_positioner),
       window_(gtk_window_new(GTK_WINDOW_POPUP)),
       layout_(NULL),
       opened_(false) {
   GTK_WIDGET_UNSET_FLAGS(window_, GTK_CAN_FOCUS);
   // Don't allow the window to be resized.  This also forces the window to
   // shrink down to the size of its child contents.
   gtk_window_set_resizable(GTK_WINDOW(window_), FALSE);
   gtk_widget_set_app_paintable(window_, TRUE);
   // Have GTK double buffer around the expose signal.
   gtk_widget_set_double_buffered(window_, TRUE);
@@ skipping 69 matching lines @@
 void AutocompletePopupViewGtk::PaintUpdatesNow() {
   // Paint our queued invalidations now, synchronously.
   gdk_window_process_updates(window_->window, FALSE);
 }
 
 AutocompletePopupModel* AutocompletePopupViewGtk::GetModel() {
   return model_.get();
 }
 
 void AutocompletePopupViewGtk::Show(size_t num_results) {
-  gfx::Rect rect = popup_positioner_->GetPopupBounds();
+  gfx::Rect rect = bubble_positioner_->GetLocationStackBounds();
+  rect.set_y(rect.bottom());
   rect.set_height((num_results * kHeightPerResult) + (kBorderThickness * 2));
 
   gtk_window_move(GTK_WINDOW(window_), rect.x(), rect.y());
   gtk_widget_set_size_request(window_, rect.width(), rect.height());
   gtk_widget_show(window_);
   opened_ = true;
 }
 
 void AutocompletePopupViewGtk::Hide() {
   gtk_widget_hide(window_);
@@ skipping 153 matching lines @@
 
   return FALSE;
 }
 
 // static
 AutocompletePopupView* AutocompletePopupView::CreatePopupView(
     const gfx::Font& font,
     AutocompleteEditView* edit_view,
     AutocompleteEditModel* edit_model,
     Profile* profile,
-    AutocompletePopupPositioner* popup_positioner) {
+    const BubblePositioner* bubble_positioner) {
   return new AutocompletePopupViewGtk(edit_view, edit_model, profile,
-                                      popup_positioner);
+                                      bubble_positioner);
 }