[Mac] The autocomplete popup now gets its position from the toolbar controlle...

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 "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_popup_view.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"
 #include "chrome/browser/cocoa/nsimage_cache.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 
 // Name of image in the bundle for the yellow of the star icon.
 static NSString* const kStarredImageName = @"starred.pdf";
 
 // Height of the toolbar in pixels when the bookmark bar is closed.
 static const float kBaseToolbarHeight = 39.0;
 
 // Overlap (in pixels) between the toolbar and the bookmark bar.
 static const float kBookmarkBarOverlap = 5.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 {
+ public:
+  AutocompletePopupPositionerMac(ToolbarController* controller)
+      : controller_(controller) { }
+  virtual ~AutocompletePopupPositionerMac() { }
+
+  // Overridden from AutocompletePopupPositioner.
+  virtual gfx::Rect GetPopupBounds() const {
+    return [controller_ autocompletePopupPosition];
+  }
+
+ private:
+  ToolbarController* controller_;  // weak, owns us
+};
+
+}  // namespace
+
 namespace ToolbarControllerInternal {
 
 // A C++ class registered for changes in preferences. Bridges the
 // notification back to the ToolbarController.
 class PrefObserverBridge : public NotificationObserver {
  public:
   PrefObserverBridge(ToolbarController* controller)
       : controller_(controller) { }
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     if (type == NotificationType::PREF_CHANGED)
       [controller_ prefChanged:Details<std::wstring>(details).ptr()];
   }
  private:
   ToolbarController* controller_;  // weak, owns us
 };
 
-}  // namespace
+}  // namespace ToolbarControllerInternal
 
 @implementation ToolbarController
 
 - (id)initWithModel:(ToolbarModel*)model
            commands:(CommandUpdater*)commands
             profile:(Profile*)profile
             browser:(Browser*)browser
      resizeDelegate:(id<ViewResizer>)resizeDelegate
    bookmarkDelegate:(id<BookmarkURLOpener>)delegate {
   DCHECK(model && commands && profile);
@@ skipping 24 matching lines @@
   hasToolbar_ = YES;
 
   [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_];
-  locationBarView_.reset(new LocationBarViewMac(locationBar_, commands_,
-                                                toolbarModel_, profile_));
+  popupPositioner_.reset(new AutocompletePopupPositionerMac(self));
+  locationBarView_.reset(new LocationBarViewMac(locationBar_,
+                                                popupPositioner_.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,
                               prefObserver_.get());
   [self showOptionalHomeButton];
@@ skipping 257 matching lines @@
   [NSMenu popUpContextMenu:wrenchMenu_
                  withEvent:[NSApp currentEvent]
                    forView:wrenchButton_];
 }
 
 - (NSRect)starButtonInWindowCoordinates {
   return [[[starButton_ window] contentView] convertRect:[starButton_ bounds]
                                                 fromView:starButton_];
 }
 
+- (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.
+  NSRect locationFrame = [locationBar_ frame];
+  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]));
+}
 @end