[Mac] The autocomplete popup now gets its position from the toolbar controller,

rather than simply growing its width by 2*height.

BUG=None
TEST=The autocomplete popup should continue to appear in the same location.
Review URL: http://codereview.chromium.org/173439

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24586 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 21 insertions, 0 deletions

diff --git a/chrome/browser/cocoa/toolbar_controller_unittest.mm b/chrome/browser/cocoa/toolbar_controller_unittest.mm
index 091bddc..a39481b 100644
--- a/chrome/browser/cocoa/toolbar_controller_unittest.mm
+++ b/chrome/browser/cocoa/toolbar_controller_unittest.mm
@@ -256,5 +256,26 @@ TEST_F(ToolbarControllerTest, StarButtonInWindowCoordinates) {
   EXPECT_TRUE(NSContainsRect(all, star));
 }
 
+TEST_F(ToolbarControllerTest, AutocompletePopupPosition) {
+  NSView* locationBar = [[bar_ toolbarViews] objectAtIndex:kLocationIndex];
+
+  // The window frame (in window base coordinates).
+  NSRect all = [[[bar_ view] window] frame];
+  // The frame of the location bar in window base coordinates.
+  NSRect locationFrame =
+      [locationBar convertRect:[locationBar bounds] toView:nil];
+  // The frame of the popup in window base coordinates.
+  gfx::Rect popupFrame = [bar_ autocompletePopupPosition];
+
+  // Make sure the popup starts to the left of and ends to the right of the
+  // location bar.
+  EXPECT_LT(popupFrame.x(), NSMinX(locationFrame));
+  EXPECT_GT(popupFrame.right(), NSMaxX(locationFrame));
+
+  // Make sure the popup frame is positioned at the bottom of the location bar.
+  EXPECT_EQ(popupFrame.bottom(), NSMinY(locationFrame));
+}
+
+
 
 }  // namespace