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

chrome/browser/autocomplete/autocomplete_popup_view_mac.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.
 
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "app/gfx/text_elider.h"
 #include "base/sys_string_conversions.h"
+#include "base/gfx/rect.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/cocoa/event_utils.h"
 #include "chrome/browser/cocoa/nsimage_cache.h"
 
 namespace {
 
 // The size delta between the font used for the edit and the result
 // rows.
@@ skipping 210 matching lines @@
 - (void)select:sender;
 
 // Resize the popup when the field's window resizes.
 - (void)windowDidResize:(NSNotification*)notification;
 
 @end
 
 AutocompletePopupViewMac::AutocompletePopupViewMac(
     AutocompleteEditViewMac* edit_view,
     AutocompleteEditModel* edit_model,
+    AutocompletePopupPositioner* positioner,
     Profile* profile,
     NSTextField* field)
     : model_(new AutocompletePopupModel(this, edit_model, profile)),
       edit_view_(edit_view),
+      positioner_(positioner),
       field_(field),
       matrix_target_([[AutocompleteMatrixTarget alloc] initWithPopupView:this]),
       popup_(nil) {
   DCHECK(edit_view);
   DCHECK(edit_model);
   DCHECK(profile);
   edit_model->set_popup_model(model_.get());
 }
 
 AutocompletePopupViewMac::~AutocompletePopupViewMac() {
@@ skipping 56 matching lines @@
                 object:[field_ window]];
 
     popup_.reset(nil);
 
     return;
   }
 
   CreatePopupIfNeeded();
 
   // Layout the popup and size it to land underneath the field.
-  // TODO(shess) Consider refactoring to remove this depenency,
-  // because the popup doesn't need any of the field-like aspects of
-  // field_.  The edit view could expose helper methods for attaching
-  // the window to the field.
-
-  // Locate |field_| on the screen, and pad the left and right sides
-  // by the height to make it wide enough to include the star and go
-  // buttons.
-  // TODO(shess): This assumes that those buttons will be square.
-  // Better to plumb through so that this code can get the rect from
-  // the toolbar controller?
-  NSRect r = [field_ convertRect:[field_ bounds] toView:nil];
-  r.origin.x -= r.size.height;
-  r.size.width += 2 * r.size.height;
+  NSRect r = NSRectFromCGRect(positioner_->GetPopupBounds().ToCGRect());
   r.origin = [[field_ window] convertBaseToScreen:r.origin];
   DCHECK_GT(r.size.width, 0.0);
 
   // The popup's font is a slightly smaller version of what |field_|
   // uses.
   NSFont* fieldFont = [field_ font];
   const CGFloat resultFontSize = [fieldFont pointSize] + kEditFontAdjust;
   gfx::Font resultFont = gfx::Font::CreateFont(
       base::SysNSStringToWide([fieldFont fontName]), (int)resultFontSize);
 
@@ skipping 267 matching lines @@
   DCHECK(popup_view_);
 
   // TODO(shess): UpdatePopupAppearance() is called frequently, so it
   // should be really cheap, but in this case we could probably make
   // things even cheaper by refactoring between the popup-placement
   // code and the matrix-population code.
   popup_view_->UpdatePopupAppearance();
 }
 
 @end