trunk/src/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm - Issue 12905008: Revert 190519 "Alternate NTP Mac: Show overlay at fixed position"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

Issue 12905008: Revert 190519 "Alternate NTP Mac: Show overlay at fixed position" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « trunk/src/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm ('k') | trunk/src/chrome/browser/ui/cocoa/browser_window_controller_private.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

===================================================================

--- trunk/src/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm (revision 190529)

+++ trunk/src/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm (working copy)

@@ -351,9 +351,9 @@

IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, ContentOffset) {

OverlayableContentsController* overlay =

[controller() overlayableContentsController];

// Just toolbar.

- EXPECT_EQ(bookmarks::kBookmarkBarOverlap - 1,

- [overlay activeContainerOffset]);

+ EXPECT_EQ(0, [overlay activeContainerOffset]);

// Plus bookmark bar.

browser()->window()->ToggleBookmarkBar();

@@ -363,13 +363,12 @@

// Plus info bar.

ShowInfoBar();

EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR) +

- GetViewHeight(VIEW_ID_INFO_BAR),

+ GetViewHeight(VIEW_ID_INFO_BAR),

[overlay activeContainerOffset]);

// Minus bookmark bar.

browser()->window()->ToggleBookmarkBar();

- EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR) + bookmarks::kBookmarkBarOverlap,

- [overlay activeContainerOffset]);

+ EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR), [overlay activeContainerOffset]);

}

// Verify that in non-Instant presentation mode the content area is beneath

@@ -408,8 +407,7 @@

[controller() overlayableContentsController];

// Just toolbar.

- EXPECT_EQ(bookmarks::kBookmarkBarOverlap - 1,

- [overlay activeContainerOffset]);

+ EXPECT_EQ(0, [overlay activeContainerOffset]);

// Plus bookmark bar.

browser()->window()->ToggleBookmarkBar();

@@ -442,13 +440,12 @@

// Plus info bar.

ShowInfoBar();

EXPECT_EQ(GetViewHeight(VIEW_ID_BOOKMARK_BAR) +

- GetViewHeight(VIEW_ID_INFO_BAR),

+ GetViewHeight(VIEW_ID_INFO_BAR),

[overlay activeContainerOffset]);

// Minus bookmark bar.

browser()->window()->ToggleBookmarkBar();

- EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR) + bookmarks::kBookmarkBarOverlap,

- [overlay activeContainerOffset]);

+ EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR), [overlay activeContainerOffset]);

}

// Verify that if bookmark bar is underneath Instant search results then