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

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
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 e8b2b6398db0726b6ef901a62cac4e1aa85ddb9c..d05ea5b0c6687c115eb53c09bd5c1d36f3e0a372 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
@@ -314,6 +314,29 @@ IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
VerifyZOrder(view_list);
}
+// Verify that in presentation mode, instant search results are below the
dhollowa 2013/03/25 16:28:18 nit: "Instant"
sail 2013/03/26 00:16:43 Done.
+// floating toolbar.
+IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
+ 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,

Powered by Google App Engine
This is Rietveld 408576698