Convert the AutocompletePopupPositioner into a BubblePositioner in preparatio...

chrome/browser/gtk/browser_toolbar_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/gtk/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include "app/gtk_dnd_util.h"
@@ skipping 43 matching lines @@
 
 // Exterior padding on left/right of toolbar.
 const int kLeftRightPadding = 2;
 
 // Height of the toolbar in pixels when we only show the location bar.
 const int kToolbarHeightLocationBarOnly = kToolbarHeight - 2;
 
 // Interior spacing between toolbar widgets.
 const int kToolbarWidgetSpacing = 4;
 
-// The amount of space between the bottom of the star and the top of the
-// Omnibox results popup window.  We want a two pixel space between the bottom
-// and the results, but have some extra space below the buttons already.
-const int kPopupTopMargin = 0;
-
-// Space between the edge of the star/go button and the popup frame.  We want
-// to leave 1 pixel on both side here so that the borders line up.
-const int kPopupLeftRightMargin = 1;
-
 // The color used as the base[] color of the location entry during a secure
 // connection.
 const GdkColor kSecureColor = GDK_COLOR_RGB(255, 245, 195);
 
 }  // namespace
 
 // BrowserToolbarGtk, public ---------------------------------------------------
 
 BrowserToolbarGtk::BrowserToolbarGtk(Browser* browser, BrowserWindowGtk* window)
     : toolbar_(NULL),
@@ skipping 335 matching lines @@
 
   profile_ = profile;
   location_bar_->SetProfile(profile);
 }
 
 void BrowserToolbarGtk::UpdateTabContents(TabContents* contents,
                                           bool should_restore_state) {
   location_bar_->Update(should_restore_state ? contents : NULL);
 }
 
-gfx::Rect BrowserToolbarGtk::GetPopupBounds() const {
+gfx::Rect BrowserToolbarGtk::GetLocationStackBounds() const {
+  // The number of pixels from the left or right edges of the location stack to
+  // "just inside the visible borders".  When the omnibox bubble contents are
+  // aligned with this, the visible borders tacked on to the outsides will line
+  // up with the visible borders on the location stack.
+  const int kLocationStackEdgeWidth = 1;
+
   GtkWidget* left;
   GtkWidget* right;
   if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) {
     left = go_->widget();
     right = star_->widget();
   } else {
     left = star_->widget();
     right = go_->widget();
   }
 
   gint origin_x, origin_y;
   DCHECK_EQ(left->window, right->window);
   gdk_window_get_origin(left->window, &origin_x, &origin_y);
 
   gint right_x = origin_x + right->allocation.x + right->allocation.width;
-
   gint left_x = origin_x + left->allocation.x;
-
-  // Bottom edge.
-  gint left_y = origin_y + left->allocation.y + left->allocation.height;
-
   DCHECK_LE(left_x, right_x);
 
-  return gfx::Rect(left_x + kPopupLeftRightMargin, left_y + kPopupTopMargin,
-                   right_x - left_x - (2 * kPopupLeftRightMargin), 0);
+  gfx::Rect stack_bounds(left_x, origin_y + left->allocation.y,
+                         right_x - left_x, left->allocation.height);
+  // Inset the bounds to just inside the visible edges (see comment above).
+  stack_bounds.Inset(kLocationStackEdgeWidth, 0);
+  return stack_bounds;
 }
 
 // BrowserToolbarGtk, private --------------------------------------------------
 
 CustomDrawButton* BrowserToolbarGtk::BuildToolbarButton(
     int normal_id, int active_id, int highlight_id, int depressed_id,
     const std::string& localized_tooltip, const char* stock_id) {
   CustomDrawButton* button = new CustomDrawButton(
       GtkThemeProvider::GetFrom(profile_),
       normal_id, active_id, highlight_id, depressed_id, stock_id,
@@ skipping 236 matching lines @@
   menu->PopupAsFromKeyEvent(button);
   menu_bar_helper_.MenuStartedShowing(button, menu->widget());
 }
 
 void BrowserToolbarGtk::PopupForButtonNextTo(GtkWidget* button,
                                              GtkMenuDirectionType dir) {
   GtkWidget* other_button = button == page_menu_button_.get() ?
       app_menu_button_.get() : page_menu_button_.get();
   PopupForButton(other_button);
 }