ash/immersive mode: Hide the launcher when entering immersive mode

chrome/browser/ui/views/immersive_mode_controller_browsertest.cc

 // Copyright (c) 2012 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/immersive_mode_controller.h"
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/view.h"
 
+#if defined(USE_ASH)
+#include "ash/root_window_controller.h"
+#include "ash/shelf_types.h"
+#include "ash/shell.h"
+#include "ash/wm/shelf_layout_manager.h"
+#endif
+
 namespace {
 
 // Returns the bounds of |view| in widget coordinates.
 gfx::Rect GetRectInWidget(views::View* view) {
   return view->ConvertRectToWidget(view->GetLocalBounds());
 }
 
 }  // namespace
 
 typedef InProcessBrowserTest ImmersiveModeControllerTest;
@@ skipping 37 matching lines @@
 
   // Trigger a reveal keeps us in immersive mode, but top-of-window views
   // become visible.
   controller->StartRevealForTest();
   EXPECT_TRUE(controller->enabled());
   EXPECT_FALSE(controller->ShouldHideTopViews());
   EXPECT_TRUE(controller->IsRevealed());
   EXPECT_FALSE(browser_view->tabstrip()->IsImmersiveStyle());
   EXPECT_TRUE(browser_view->IsTabStripVisible());
   EXPECT_TRUE(browser_view->IsToolbarVisible());
+  // Shelf hide triggered by enabling immersive mode eventually changes the
+  // widget bounds and causes a Layout(). Force it to happen early for test.
+  browser_view->parent()->Layout();
   // Content area is still immediately below the tab indicators.
   EXPECT_EQ(GetRectInWidget(browser_view).y() + Tab::GetImmersiveHeight(),
             GetRectInWidget(contents_view).y());
 
   // Ending a reveal keeps us in immersive mode, but toolbar goes invisible.
   controller->CancelReveal();
   EXPECT_TRUE(controller->enabled());
   EXPECT_TRUE(controller->ShouldHideTopViews());
   EXPECT_FALSE(controller->IsRevealed());
   EXPECT_TRUE(browser_view->tabstrip()->IsImmersiveStyle());
@@ skipping 24 matching lines @@
   // When hiding the tab indicators, content is at the top of the browser view
   // both before and during reveal.
   controller->SetEnabled(false);
   controller->SetHideTabIndicatorsForTest(true);
   controller->SetEnabled(true);
   EXPECT_FALSE(browser_view->IsTabStripVisible());
   EXPECT_EQ(GetRectInWidget(browser_view).y(),
             GetRectInWidget(contents_view).y());
   controller->StartRevealForTest();
   EXPECT_TRUE(browser_view->IsTabStripVisible());
+  // Shelf hide triggered by enabling immersive mode eventually changes the
+  // widget bounds and causes a Layout(). Force it to happen early for test.
+  browser_view->parent()->Layout();
   EXPECT_EQ(GetRectInWidget(browser_view).y(),
             GetRectInWidget(contents_view).y());
   controller->SetEnabled(false);
   controller->SetHideTabIndicatorsForTest(false);
 
   // Reveal ends when the mouse moves out of the reveal view.
   controller->SetEnabled(true);
   controller->StartRevealForTest();
   controller->OnRevealViewLostMouseForTest();
   EXPECT_FALSE(controller->IsRevealed());
@@ skipping 34 matching lines @@
   EXPECT_FALSE(browser_view->tabstrip()->IsImmersiveStyle());
   EXPECT_TRUE(browser_view->IsTabStripVisible());
   EXPECT_TRUE(browser_view->IsToolbarVisible());
 #endif  // defined(USE_AURA) && !defined(OS_WIN)
 
   // Don't crash if we exit the test during a reveal.
   browser_view->GetWidget()->Maximize();
   controller->SetEnabled(true);
   controller->StartRevealForTest();
 }
+
+#if defined(USE_ASH)
+// Test shelf auto-hide toggling behavior.
+IN_PROC_BROWSER_TEST_F(ImmersiveModeControllerTest, ImmersiveShelf) {
+  ui::LayerAnimator::set_disable_animations_for_test(true);
+
+  BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
+  ImmersiveModeController* immersive_controller =
+      browser_view->immersive_mode_controller();
+  browser_view->GetWidget()->Maximize();
+
+  // Shelf is visible when the test starts.
+  ash::internal::ShelfLayoutManager* shelf =
+      ash::Shell::GetPrimaryRootWindowController()->shelf();
+  ASSERT_EQ(ash::SHELF_VISIBLE, shelf->visibility_state());
+
+  // Turning immersive mode on sets the shelf to auto-hide.
+  immersive_controller->SetEnabled(true);
+  EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
+
+  // Disabling immersive mode puts it back.
+  immersive_controller->SetEnabled(false);
+  EXPECT_EQ(ash::SHELF_VISIBLE, shelf->visibility_state());
+
+  // The user could toggle the launcher behavior.
+  shelf->SetAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
+  EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
+
+  // Enabling immersive mode keeps auto-hide.
+  immersive_controller->SetEnabled(true);
+  EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
+
+  // Disabling immersive mode maintains the user's auto-hide selection.
+  immersive_controller->SetEnabled(false);
+  EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
+}
+#endif  // defined(OS_CHROMEOS)