Shift omnibox dropdown in and up on Windows, and square off the top, so it co...

chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 <string>
 
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
-#include "chrome/browser/bubble_positioner.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/gtk/gtk_util.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/common/notification_service.h"
 #include "gfx/font.h"
 #include "gfx/gtk_util.h"
 #include "gfx/rect.h"
 #include "grit/theme_resources.h"
@@ skipping 148 matching lines @@
   // TODO(estade): Do we want to flip these for RTL?  (Windows doesn't).
   return ResourceBundle::GetSharedInstance().GetPixbufNamed(icon);
 }
 
 }  // namespace
 
 AutocompletePopupViewGtk::AutocompletePopupViewGtk(
     AutocompleteEditView* edit_view,
     AutocompleteEditModel* edit_model,
     Profile* profile,
-    const BubblePositioner* bubble_positioner)
+    const GtkWidget* location_bar)
     : model_(new AutocompletePopupModel(this, edit_model, profile)),
       edit_view_(edit_view),
-      bubble_positioner_(bubble_positioner),
+      location_bar_(location_bar),
       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 75 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 = 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());
+ gint origin_x, origin_y;

[Evan Stade, 2010/04/08 22:01:21]

nit: indentation

+ gdk_window_get_origin(location_bar_->window, &origin_x, &origin_y);
+ const GtkAllocation& allocation = location_bar_->allocation;
+ gtk_window_move(GTK_WINDOW(window_),
+     origin_x + allocation.x - kBorderThickness,
+     origin_y + allocation.y + allocation.height - kBorderThickness - 1);
+ gtk_widget_set_size_request(window_, allocation.width + (kBorderThickness * 2),
+     (num_results * kHeightPerResult) + (kBorderThickness * 2));
   gtk_widget_show(window_);
   StackWindow();
   opened_ = true;
 }
 
 void AutocompletePopupViewGtk::Hide() {
   gtk_widget_hide(window_);
   opened_ = false;
 }
 
@@ skipping 161 matching lines @@
                           text_width - actual_content_width -
                           actual_description_width / PANGO_SCALE,
                       content_y, layout_);
     }
   }
 
   g_object_unref(gc);
 
   return TRUE;
 }
-
-// static
-AutocompletePopupView* AutocompletePopupView::CreatePopupView(
-    const gfx::Font& font,
-    AutocompleteEditView* edit_view,
-    AutocompleteEditModel* edit_model,
-    Profile* profile,
-    const BubblePositioner* bubble_positioner) {
-  return new AutocompletePopupViewGtk(edit_view, edit_model, profile,
-                                      bubble_positioner);
-}