Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1467)

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

Issue 12594015: Alternate NTP Mac: Push down overlay in presentation mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | « no previous file | chrome/browser/ui/cocoa/browser_window_controller_private.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
index 0127a5a9af9f8ccc33bd47bf772f7c7c5185a4b6..b27bc83d77ece0cd61b941d622fd14fba447dc00 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
@@ -317,6 +317,29 @@ IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
VerifyZOrder(view_list);
}
+// Verify that in presentation mode, Instant search results are below the
+// floating toolbar.
+IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
+ DISABLED_OverlayOffsetInstantPresentationMode) {
+ chrome::ToggleFullscreenMode(browser());
+ ShowInstantResults();
+ [controller() setFloatingBarShownFraction:0.0];
+ EXPECT_EQ(
+ 0, [[controller() overlayableContentsController] overlayContentsOffset]);
+ EXPECT_EQ(
+ 0, [[controller() overlayableContentsController] activeContainerOffset]);
+ [controller() setFloatingBarShownFraction:1.0];
+
+ NSView* floating_bar = GetViewWithID(VIEW_ID_FULLSCREEN_FLOATING_BAR);
+ CGFloat floating_bar_height = NSHeight([floating_bar frame]);
+ EXPECT_EQ(
+ floating_bar_height,
+ [[controller() overlayableContentsController] overlayContentsOffset]);
+ EXPECT_EQ(
+ floating_bar_height,
+ [[controller() overlayableContentsController] activeContainerOffset]);
+}
+
// Verify that if the fullscreen floating bar view is below the tab content area
// then calling |updateSubviewZOrder:| will correctly move back above.
IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/browser_window_controller_private.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698