ChromeOS MD: Fix cannot drag tab onto immersive fullscreen window

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/root_window_controller.h"
@@ skipping 91 matching lines @@
  private:
   // Not owned.
   ImmersiveModeController* controller_;
 
   std::unique_ptr<ImmersiveRevealedLock> revealed_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerAshTest);
 };
 
 // Test the layout and visibility of the tabstrip, toolbar and TopContainerView
-// in immersive fullscreen.
+// in immersive fullscreen. For MD, tabstrip is considered as visible with top
+// container offscreen.
 TEST_F(ImmersiveModeControllerAshTest, Layout) {
   AddTab(browser(), GURL("about:blank"));
 
   TabStrip* tabstrip = browser_view()->tabstrip();
   ToolbarView* toolbar = browser_view()->toolbar();
   views::WebView* contents_web_view =
       browser_view()->GetContentsWebViewForTest();
 
   // Immersive fullscreen starts out disabled.
   ASSERT_FALSE(browser_view()->GetWidget()->IsFullscreen());
   ASSERT_FALSE(controller()->IsEnabled());
 
   // By default, the tabstrip and toolbar should be visible.
   EXPECT_TRUE(tabstrip->visible());
   EXPECT_TRUE(toolbar->visible());
 
   ToggleFullscreen();
   EXPECT_TRUE(browser_view()->GetWidget()->IsFullscreen());
   EXPECT_TRUE(controller()->IsEnabled());
   EXPECT_FALSE(controller()->IsRevealed());
   EXPECT_FALSE(toolbar->visible());
-  // For MD, the browser's top chrome is completely hidden in immersive
-  // fullscreen mode.
+  // For MD, the browser's top chrome is completely offscreen with tapstrip
+  // visible.
   bool is_using_material_design =
       ash::MaterialDesignController::IsImmersiveModeMaterial();
-  if (is_using_material_design) {
-    EXPECT_FALSE(tabstrip->visible());
-  } else {
-    EXPECT_TRUE(tabstrip->visible());
+  EXPECT_TRUE(tabstrip->visible());
+  if (!is_using_material_design)
     EXPECT_TRUE(tabstrip->IsImmersiveStyle());
-  }
 
   // The tab indicators should be flush with the top of the widget.
   EXPECT_EQ(0, GetBoundsInWidget(tabstrip).y());
 
   // In MD, since the tab strip and tool bar are both hidden in immersive
   // fullscreen mode, the web contents should extend to the edge of screen. In
   // non-MD, the web contents should be immediately below the tab indicators.
   if (is_using_material_design) {
     EXPECT_EQ(0, GetBoundsInWidget(contents_web_view).y());
   } else {
@@ skipping 34 matching lines @@
   EXPECT_TRUE(controller()->IsRevealed());
   EXPECT_TRUE(tabstrip->visible());
   EXPECT_FALSE(tabstrip->IsImmersiveStyle());
   EXPECT_TRUE(toolbar->visible());
   EXPECT_EQ(0, GetBoundsInWidget(browser_view()->top_container()).y());
 
   // The web contents should be flush with the top edge of the widget when in
   // both immersive and tab fullscreen.
   EXPECT_EQ(0, GetBoundsInWidget(contents_web_view).y());
 
-  // Hide the top-of-window views. Both the tab strip and the toolbar should
-  // hide when in both immersive and tab fullscreen.
+  // Hide the top-of-window views. For MD, tabstrip is considered as visible.
   AttemptUnreveal();
   EXPECT_FALSE(controller()->IsRevealed());
-  EXPECT_FALSE(tabstrip->visible());
+  if (is_using_material_design)
+    EXPECT_TRUE(tabstrip->visible());
+  else
+    EXPECT_FALSE(tabstrip->visible());
   EXPECT_FALSE(toolbar->visible());
 
   // The web contents should still be flush with the edge of the widget.
   EXPECT_EQ(0, GetBoundsInWidget(contents_web_view).y());
 
   // Exiting both immersive and tab fullscreen should show the tab strip and
   // toolbar.
   ToggleFullscreen();
   EXPECT_FALSE(browser_view()->GetWidget()->IsFullscreen());
   EXPECT_FALSE(controller()->IsEnabled());
@@ skipping 103 matching lines @@
  public:
   ImmersiveModeControllerAshTestHostedApp()
       : ImmersiveModeControllerAshTest(Browser::TYPE_POPUP, true) {}
   ~ImmersiveModeControllerAshTestHostedApp() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerAshTestHostedApp);
 };
 
 // Test the layout and visibility of the TopContainerView and web contents when
-// a hosted app is put into immersive fullscreen.
+// a hosted app is put into immersive fullscreen. For MD, tabstrip is considered
+// as visible with immersive fullsceen.
 TEST_F(ImmersiveModeControllerAshTestHostedApp, Layout) {
   // Add a tab because the browser starts out without any tabs at all.
   AddTab(browser(), GURL("about:blank"));
 
   TabStrip* tabstrip = browser_view()->tabstrip();
   ToolbarView* toolbar = browser_view()->toolbar();
   views::WebView* contents_web_view =
       browser_view()->GetContentsWebViewForTest();
   views::View* top_container = browser_view()->top_container();
 
   // Immersive fullscreen starts out disabled.
   ASSERT_FALSE(browser_view()->GetWidget()->IsFullscreen());
   ASSERT_FALSE(controller()->IsEnabled());
 
   // The tabstrip and toolbar are not visible for hosted apps.
   EXPECT_FALSE(tabstrip->visible());
   EXPECT_FALSE(toolbar->visible());
 
   // The window header should be above the web contents.
   int header_height = GetBoundsInWidget(contents_web_view).y();
 
   ToggleFullscreen();
   EXPECT_TRUE(browser_view()->GetWidget()->IsFullscreen());
   EXPECT_TRUE(controller()->IsEnabled());
   EXPECT_FALSE(controller()->IsRevealed());
 
   // Entering immersive fullscreen should make the web contents flush with the
   // top of the widget.
-  EXPECT_FALSE(tabstrip->visible());
   EXPECT_FALSE(toolbar->visible());
-  EXPECT_TRUE(top_container->GetVisibleBounds().IsEmpty());
+  bool is_using_material_design =
+      ash::MaterialDesignController::IsImmersiveModeMaterial();
+  if (is_using_material_design) {
+    EXPECT_TRUE(tabstrip->visible());
+  } else {
+    EXPECT_FALSE(tabstrip->visible());
+    EXPECT_TRUE(top_container->GetVisibleBounds().IsEmpty());
+  }
   EXPECT_EQ(0, GetBoundsInWidget(contents_web_view).y());
 
   // Reveal the window header.
   AttemptReveal();
 
   // The tabstrip and toolbar should still be hidden and the web contents should
   // still be flush with the top of the screen.
   EXPECT_FALSE(tabstrip->visible());
   EXPECT_FALSE(toolbar->visible());
   EXPECT_EQ(0, GetBoundsInWidget(contents_web_view).y());
 
   // During an immersive reveal, the window header should be painted to the
   // TopContainerView. The TopContainerView should be flush with the top of the
   // widget and have |header_height|.
   gfx::Rect top_container_bounds_in_widget(GetBoundsInWidget(top_container));
   EXPECT_EQ(0, top_container_bounds_in_widget.y());
   EXPECT_EQ(header_height, top_container_bounds_in_widget.height());
 
   // Exit immersive fullscreen. The web contents should be back below the window
   // header.
   ToggleFullscreen();
   EXPECT_FALSE(browser_view()->GetWidget()->IsFullscreen());
   EXPECT_FALSE(controller()->IsEnabled());
   EXPECT_FALSE(tabstrip->visible());
   EXPECT_FALSE(toolbar->visible());
   EXPECT_EQ(header_height, GetBoundsInWidget(contents_web_view).y());
 }