cros: Instant extended support for immersive fullscreen

chrome/browser/ui/views/frame/browser_view_browsertest.cc

Index: chrome/browser/ui/views/frame/browser_view_browsertest.cc
diff --git a/chrome/browser/ui/views/frame/browser_view_browsertest.cc b/chrome/browser/ui/views/frame/browser_view_browsertest.cc
index 7600d44d693a735f247455943a1adc6c03b8917c..b2103221e0dec477c90a65f920b93b987b859b9b 100644
--- a/chrome/browser/ui/views/frame/browser_view_browsertest.cc
+++ b/chrome/browser/ui/views/frame/browser_view_browsertest.cc
@@ -7,6 +7,7 @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
+#include "chrome/browser/ui/views/frame/browser_view_layout.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
@@ -15,10 +16,28 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "ui/views/controls/single_split_view.h"
+#include "ui/views/controls/webview/webview.h"
 #include "ui/views/focus/focus_manager.h"
+#include "ui/views/window/non_client_view.h"
 
 using views::FocusManager;
 
+namespace {
+
+// Tab strip bounds depend on the window frame sizes.
+gfx::Point ExpectedTabStripOrigin(BrowserView* browser_view) {
+  gfx::Rect tabstrip_bounds(
+      browser_view->frame()->GetBoundsForTabStrip(browser_view->tabstrip()));
+  gfx::Point tabstrip_origin(tabstrip_bounds.origin());
+  views::View::ConvertPointToTarget(browser_view->parent(),
+                                    browser_view,
+                                    &tabstrip_origin);
+  return tabstrip_origin;
+}
+
+}
+
 typedef InProcessBrowserTest BrowserViewTest;
 
 IN_PROC_BROWSER_TEST_F(BrowserViewTest, BrowserView) {
@@ -26,6 +45,12 @@ IN_PROC_BROWSER_TEST_F(BrowserViewTest, BrowserView) {
 
   BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
   TopContainerView* top_container = browser_view->top_container();
+  TabStrip* tabstrip = browser_view->tabstrip();
+  ToolbarView* toolbar = browser_view->toolbar();
+  views::SingleSplitView* contents_split =
+      browser_view->GetContentsSplitForTest();
+  views::WebView* contents_container =
+      browser_view->GetContentsContainerForTest();
 
   // Verify the view hierarchy.
   EXPECT_EQ(top_container, browser_view->tabstrip()->parent());
@@ -41,6 +66,19 @@ IN_PROC_BROWSER_TEST_F(BrowserViewTest, BrowserView) {
   EXPECT_EQ(0, top_container->x());
   EXPECT_EQ(0, top_container->y());
   EXPECT_EQ(browser_view->width(), top_container->width());
+  // Tabstrip layout varies based on window frame sizes.
+  gfx::Point expected_tabstrip_origin = ExpectedTabStripOrigin(browser_view);
+  EXPECT_EQ(expected_tabstrip_origin.x(), tabstrip->x());
+  EXPECT_EQ(expected_tabstrip_origin.y(), tabstrip->y());
+  EXPECT_EQ(0, toolbar->x());
+  EXPECT_EQ(
+      tabstrip->bounds().bottom() -
+          BrowserViewLayout::kToolbarTabStripVerticalOverlap,
+      toolbar->y());
+  EXPECT_EQ(0, contents_split->x());
+  EXPECT_EQ(toolbar->bounds().bottom(), contents_split->y());
+  EXPECT_EQ(0, contents_container->x());
+  EXPECT_EQ(0, contents_container->y());
 
   // Verify bookmark bar visibility.
   BookmarkBarView* bookmark_bar = browser_view->GetBookmarkBarView();
@@ -62,6 +100,20 @@ IN_PROC_BROWSER_TEST_F(BrowserViewTest, BrowserView) {
   EXPECT_EQ(browser_view->child_count() - 1,
             browser_view->GetIndexOf(top_container));
 
+  // Bookmark bar layout on NTP.
+  EXPECT_EQ(0, bookmark_bar->x());
+  EXPECT_EQ(
+      tabstrip->bounds().bottom() +
+          toolbar->height() -
+          BrowserViewLayout::kToolbarTabStripVerticalOverlap -
+          views::NonClientFrameView::kClientEdgeThickness,
+      bookmark_bar->y());
+  EXPECT_EQ(toolbar->bounds().bottom(), contents_split->y());
+  // Contents have a "top margin" pushing them below the bookmark bar.
+  EXPECT_EQ(bookmark_bar->height() -
+                views::NonClientFrameView::kClientEdgeThickness,
+            contents_container->y());
+
   // Bookmark bar is parented back to top container on normal page.
   ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
   EXPECT_FALSE(bookmark_bar->visible());