Convert the AutocompletePopupPositioner into a BubblePositioner in preparatio...

chrome/browser/cocoa/toolbar_controller.mm

 // 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.
 
 #import "chrome/browser/cocoa/toolbar_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
-#include "chrome/browser/autocomplete/autocomplete_popup_view.h"
+#include "chrome/browser/bubble_positioner.h"
 #import "chrome/browser/cocoa/autocomplete_text_field.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_editor.h"
 #import "chrome/browser/cocoa/back_forward_menu_controller.h"
 #import "chrome/browser/cocoa/gradient_button_cell.h"
 #import "chrome/browser/cocoa/location_bar_view_mac.h"
 #import "chrome/browser/cocoa/menu_button.h"
 #include "chrome/browser/cocoa/nsimage_cache.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/toolbar_model.h"
@@ skipping 13 matching lines @@
 // Overlap (in pixels) between the toolbar and the bookmark bar.
 static const float kBookmarkBarOverlap = 7.0;
 
 @interface ToolbarController(Private)
 - (void)initCommandStatus:(CommandUpdater*)commands;
 - (void)prefChanged:(std::wstring*)prefName;
 @end
 
 namespace {
 
-// A C++ class used to correctly position the autocomplete popup.
-class AutocompletePopupPositionerMac : public AutocompletePopupPositioner {
+// A C++ class used to correctly position the omnibox.
+class BubblePositionerMac : public BubblePositioner {
  public:
-  AutocompletePopupPositionerMac(ToolbarController* controller)
+  BubblePositionerMac(ToolbarController* controller)
       : controller_(controller) { }
-  virtual ~AutocompletePopupPositionerMac() { }
+  virtual ~BubblePositionerMac() { }
 
-  // Overridden from AutocompletePopupPositioner.
-  virtual gfx::Rect GetPopupBounds() const {
-    return [controller_ autocompletePopupPosition];
+  // BubblePositioner:
+  virtual gfx::Rect GetLocationStackBounds() const {
+    return [controller_ locationStackBounds];
   }
 
  private:
   ToolbarController* controller_;  // weak, owns us
 };
 
 }  // namespace
 
 namespace ToolbarControllerInternal {
 
@@ skipping 54 matching lines @@
   if (trackingArea_.get())
     [[self view] removeTrackingArea:trackingArea_.get()];
   [super dealloc];
 }
 
 // Called after the view is done loading and the outlets have been hooked up.
 // Now we can hook up bridges that rely on UI objects such as the location
 // bar and button state.
 - (void)awakeFromNib {
   [self initCommandStatus:commands_];
-  popupPositioner_.reset(new AutocompletePopupPositionerMac(self));
+  bubblePositioner_.reset(new BubblePositionerMac(self));
   locationBarView_.reset(new LocationBarViewMac(locationBar_,
-                                                popupPositioner_.get(),
+                                                bubblePositioner_.get(),
                                                 commands_, toolbarModel_,
                                                 profile_));
   [locationBar_ setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
 
   // Register pref observers for the optional home and page/options buttons
   // and then add them to the toolbar them based on those prefs.
   prefObserver_.reset(new ToolbarControllerInternal::PrefObserverBridge(self));
   PrefService* prefs = profile_->GetPrefs();
   showHomeButton_.Init(prefs::kShowHomeButton, prefs, prefObserver_.get());
   showPageOptionButtons_.Init(prefs::kShowPageOptionsButtons, prefs,
@@ skipping 363 matching lines @@
       template_url_model->GetDefaultSearchProvider() :
       template_url_model->GetTemplateURLForKeyword(keyword);
   if (!provider)
     return nil;
   std::wstring shortName(provider->AdjustedShortNameForLocaleDirection());
   return l10n_util::GetNSStringF(IDS_TOOLTIP_GO_SEARCH,
                                  WideToUTF16(shortName), currentText16);
 
 }
 
-- (gfx::Rect)autocompletePopupPosition {
-  // The popup should span from the left edge of the star button to the right
-  // edge of the go button.  The returned height is ignored.
+- (gfx::Rect)locationStackBounds {
+  // 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 = 2;
+
   NSRect locationFrame = [locationBar_ frame];
-  // TODO(shess): The buttons have an extra 2 pixels between the edge
-  // of the visual button and the edge of the logical button.  This
-  // seems wrong.
-  int minX = NSMinX([starButton_ frame]) + 2.0;
-  int maxX = NSMaxX([goButton_ frame]) - 2.0;
+  int minX = NSMinX([starButton_ frame]);
+  int maxX = NSMaxX([goButton_ frame]);
   DCHECK(minX < NSMinX(locationFrame));
   DCHECK(maxX > NSMaxX(locationFrame));
 
-  NSRect r = NSMakeRect(minX, NSMinY(locationFrame), maxX - minX, 0);
-  return gfx::Rect(NSRectToCGRect([[self view] convertRect:r toView:nil]));
+  NSRect r = NSMakeRect(minX, NSMinY(locationFrame), maxX - minX,
+                        NSHeight(locationFrame));
+  gfx::Rect stack_bounds(
+      NSRectToCGRect([[self view] convertRect:r toView:nil]));
+  // Inset the bounds to just inside the visible edges (see comment above).
+  stack_bounds.Inset(kLocationStackEdgeWidth, 0);
+  return stack_bounds;
 }
 @end