Instant Extended: Move omnibox dropdown by 2 pixels

This CL moves the omnibox dropdown by 2 pixels.

When the bookmark bar is not pinned the dropdown is now below the toolbar. Previously the dropdown would overlap the toolbar.

Screenshots with bookmark bar not pinned:
  before: http://i.imgur.com/62PBHS1.png
  after: http://i.imgur.com/3Y6HqGd.png
Screenshots with bookmark bar pinned:
  before: http://i.imgur.com/snvuulZ.png
  after: http://i.imgur.com/jhI5LFm.png

BUG=235507

Review URL: https://chromiumcodereview.appspot.com/14689007

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

chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

@@ -389,23 +389,22 @@ IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, ContentOffset) {
   OverlayableContentsController* overlay =
       [controller() overlayableContentsController];
   // Just toolbar.
-  EXPECT_EQ(bookmarks::kBookmarkBarOverlap,
-            [overlay activeContainerOffset]);
+  EXPECT_EQ(1, [overlay activeContainerOffset]);
 
   // Plus bookmark bar.
   browser()->window()->ToggleBookmarkBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR),
-            [overlay activeContainerOffset]);
+  CGFloat bookmark_bar_offset =
+      GetViewHeight(VIEW_ID_BOOKMARK_BAR) - bookmarks::kBookmarkBarOverlap + 1;
+  EXPECT_EQ(bookmark_bar_offset, [overlay activeContainerOffset]);
 
   // Plus info bar.
   ShowInfoBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR) +
-            GetViewHeight(VIEW_ID_INFO_BAR),
+  EXPECT_EQ(bookmark_bar_offset + GetViewHeight(VIEW_ID_INFO_BAR),
             [overlay activeContainerOffset]);
 
   // Minus bookmark bar.
   browser()->window()->ToggleBookmarkBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR) + bookmarks::kBookmarkBarOverlap,
+  EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR) + 1,
             [overlay activeContainerOffset]);
 }
 
@@ -468,23 +467,22 @@ IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, ContentOffsetInstantNTP) {
       [controller() overlayableContentsController];
 
   // Just toolbar.
-  EXPECT_EQ(bookmarks::kBookmarkBarOverlap,
-            [overlay activeContainerOffset]);
+  EXPECT_EQ(1, [overlay activeContainerOffset]);
 
   // Plus bookmark bar.
   browser()->window()->ToggleBookmarkBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR),
-            [overlay activeContainerOffset]);
+  CGFloat bookmark_bar_offset =
+      GetViewHeight(VIEW_ID_BOOKMARK_BAR) - bookmarks::kBookmarkBarOverlap + 1;
+  EXPECT_EQ(bookmark_bar_offset, [overlay activeContainerOffset]);
 
   // Plus info bar.
   ShowInfoBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR) +
-            GetViewHeight(VIEW_ID_INFO_BAR),
+  EXPECT_EQ(bookmark_bar_offset + GetViewHeight(VIEW_ID_INFO_BAR),
             [overlay activeContainerOffset]);
 
   // Minus bookmark bar.
   browser()->window()->ToggleBookmarkBar();
-  EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR) + bookmarks::kBookmarkBarOverlap,
+  EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR) + 1,
             [overlay activeContainerOffset]);
 }
 
@@ -495,9 +493,10 @@ IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, FindBarOffsetInstant) {
   browser()->window()->ToggleBookmarkBar();
   browser()->GetFindBarController();
 
+  CGFloat line_width = [GetViewWithID(VIEW_ID_FIND_BAR) cr_lineWidth];
   NSRect bookmark_bar_frame = [GetViewWithID(VIEW_ID_BOOKMARK_BAR) frame];
   NSRect find_bar_frame = [GetViewWithID(VIEW_ID_FIND_BAR) frame];
-  EXPECT_EQ(NSMinY(bookmark_bar_frame), NSMaxY(find_bar_frame) - 1);
+  EXPECT_EQ(NSMinY(bookmark_bar_frame), NSMaxY(find_bar_frame) - line_width);
 
   // Show instant and add a find bar to it.
   ShowInstantResults();
@@ -505,7 +504,9 @@ IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, FindBarOffsetInstant) {
 
   NSRect toolbar_bar_frame = [GetViewWithID(VIEW_ID_TOOLBAR) frame];
   find_bar_frame = [GetViewWithID(VIEW_ID_FIND_BAR) frame];
-  EXPECT_EQ(NSMinY(toolbar_bar_frame) - 1, NSMaxY(find_bar_frame));
+  EXPECT_EQ(NSMinY(toolbar_bar_frame) - bookmarks::kBookmarkBarOverlap + 1 -
+            line_width,
+            NSMaxY(find_bar_frame));
 }
 
 // Verify that if bookmark bar is underneath Instant search results then

chrome/browser/ui/cocoa/browser_window_controller_private.mm

@@ -266,8 +266,8 @@ willPositionSheet:(NSWindow*)sheet
     // The tabContentArea view starts below the omnibox.
     CGFloat minToolbarHeight = 0;
     if ([self hasToolbar]) {
-      minToolbarHeight = [toolbarController_
-          desiredHeightForCompression:bookmarks::kBookmarkBarOverlap];
+      // 1 to account for the toolbar separator.
+      minToolbarHeight = [toolbarController_ desiredHeightForCompression:1];
     }
     contentAreaTop = toolbarTopY - minToolbarHeight;
     // This is the space between the bottom of the omnibox and the bottom of the

chrome/browser/ui/cocoa/browser_window_controller_unittest.mm

@@ -257,7 +257,7 @@ void CheckViewPositions(BrowserWindowController* controller) {
   EXPECT_EQ(NSMaxY(download), NSMinY(contentArea));
 
   CGFloat min_toolbar_height = [[controller toolbarController]
-      desiredHeightForCompression:bookmarks::kBookmarkBarOverlap];
+      desiredHeightForCompression:1];
   EXPECT_EQ(NSMaxY(contentArea), NSMaxY(toolbar) - min_toolbar_height);
 
   // Bookmark bar frame is random memory when hidden.