Fix bugs wrt to immrsive mode being disabled

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

 // Copyright 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/frame/immersive_mode_controller_ash.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
+#include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
@@ skipping 239 matching lines @@
   EXPECT_TRUE(controller->IsRevealed());
   chrome::HideBookmarkBubbleView();
   EXPECT_FALSE(controller->IsRevealed());
 
   // 4) Test that focusing the web contents hides the top-of-window views.
   browser_view->SetFocusToLocationBar(false);
   EXPECT_TRUE(controller->IsRevealed());
   browser_view->GetTabContentsContainerView()->RequestFocus();
   EXPECT_FALSE(controller->IsRevealed());
 
-  // 5) Test that a dialog opened by the web contents does not initiate a
+  // 5) Test that a loss of focus of the location bar to the web contents
+  // while immersive mode is disabled is properly registered.
+  browser_view->SetFocusToLocationBar(false);
+  EXPECT_TRUE(controller->IsRevealed());
+  chrome::ToggleFullscreenMode(browser());
+  EXPECT_FALSE(controller->IsEnabled());
+  EXPECT_FALSE(controller->IsRevealed());
+  browser_view->GetTabContentsContainerView()->RequestFocus();
+  chrome::ToggleFullscreenMode(browser());
+  EXPECT_TRUE(controller->IsEnabled());
+  EXPECT_FALSE(controller->IsRevealed());
+
+  // Repeat test but with a revealed lock acquired when immersive mode is
+  // enabled because the code path is different.
+  browser_view->SetFocusToLocationBar(false);
+  EXPECT_TRUE(controller->IsRevealed());
+  chrome::ToggleFullscreenMode(browser());
+  scoped_ptr<ImmersiveModeController::RevealedLock> lock(
+      controller->GetRevealedLock());
+  EXPECT_FALSE(controller->IsRevealed());
+  browser_view->GetTabContentsContainerView()->RequestFocus();
+  chrome::ToggleFullscreenMode(browser());
+  EXPECT_TRUE(controller->IsRevealed());
+  lock.reset();
+  EXPECT_FALSE(controller->IsRevealed());
+
+  // 6) Test that a dialog opened by the web contents does not initiate a
   // reveal.
   AppModalDialogQueue* queue = AppModalDialogQueue::GetInstance();
   EXPECT_FALSE(queue->HasActiveDialog());
   content::WebContents* web_contents = browser_view->GetActiveWebContents();
   GetJavaScriptDialogManagerInstance()->RunBeforeUnloadDialog(
       web_contents,
       string16(),
       false,
       base::Bind(
           &ImmersiveModeControllerAshTest::OnBeforeUnloadJavaScriptDialogClosed,
@@ skipping 137 matching lines @@
   BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
   ImmersiveModeControllerAsh* controller =
       static_cast<ImmersiveModeControllerAsh*>(
           browser_view->immersive_mode_controller());
 
   chrome::ToggleFullscreenMode(browser());
   ASSERT_TRUE(controller->IsEnabled());
 
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  params.parent = browser_view->GetNativeWindow();
   params.bounds = kInitialBounds;
   views::Widget anchored_widget;
   anchored_widget.Init(params);
 
   // 1) Test that an anchored widget does not cause the top-of-window views to
   // reveal but instead prolongs the duration of the reveal till either the
   // widget is unanchored or is hidden.
   EXPECT_FALSE(controller->IsRevealed());
 
   anchored_widget.Show();
@@ skipping 57 matching lines @@
   // reposition the anchored widget.
   chrome::ExecuteCommand(browser(), IDC_SHOW_BOOKMARK_BAR);
   EXPECT_TRUE(browser_view->IsBookmarkBarVisible());
   gfx::Rect bounds3 = anchored_widget.GetWindowBoundsInScreen();
   EXPECT_EQ(bounds3.y(),
             browser_view->top_container()->GetBoundsInScreen().bottom() + 10);
   EXPECT_GT(bounds3.y(), bounds2.y());
   EXPECT_EQ(kInitialBounds.x(), bounds3.x());
   EXPECT_EQ(kInitialBounds.size(), bounds3.size());
 
+  // 3) Test that the anchored widget is not repositioned when immersive mode
+  // is not enabled.
+  chrome::ToggleFullscreenMode(browser());
+  ASSERT_FALSE(controller->IsEnabled());
+  chrome::ExecuteCommand(browser(), IDC_SHOW_BOOKMARK_BAR);
+  EXPECT_EQ(bounds3, anchored_widget.GetWindowBoundsInScreen());
+  EXPECT_NE(browser_view->top_container()->GetBoundsInScreen().bottom() + 10,
+            bounds3.bottom());
+
+  // 4) Test that reenabling immersive fullscreen repositions any anchored
+  // widgets.
+  //
+  // Maximize the window so that a bounds change in the top container is not
+  // reported when entering immersive fullscreen. The top container has the
+  // same bounds when |browser_view| is maximized as when the top container is
+  // revealed when |browser_view_| is in immersive mode.
+  ash::wm::MaximizeWindow(browser_view->GetNativeWindow());
+  chrome::ToggleFullscreenMode(browser());
+  ASSERT_TRUE(controller->IsEnabled());
+
+  gfx::Rect bounds4 = anchored_widget.GetWindowBoundsInScreen();
+  EXPECT_NE(bounds3, bounds4);
+  EXPECT_EQ(bounds4.y(),
+            browser_view->top_container()->GetBoundsInScreen().bottom() + 10);
+  EXPECT_EQ(kInitialBounds.x(), bounds4.x());
+  EXPECT_EQ(kInitialBounds.size(), bounds4.size());
+
   BookmarkBarView::DisableAnimationsForTesting(false);
 }
 
 // Shelf-specific immersive mode tests.
 IN_PROC_BROWSER_TEST_F(ImmersiveModeControllerAshTest, ImmersiveShelf) {
   ui::ScopedAnimationDurationScaleMode zero_duration_mode(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
   ASSERT_TRUE(chrome::UseImmersiveFullscreen());
 
   BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
@@ skipping 36 matching lines @@
 
   // Setting the window property directly toggles immersive mode.
   aura::Window* window = browser_view->GetWidget()->GetNativeWindow();
   window->SetProperty(ash::internal::kImmersiveModeKey, true);
   EXPECT_TRUE(immersive_controller->IsEnabled());
   window->SetProperty(ash::internal::kImmersiveModeKey, false);
   EXPECT_FALSE(immersive_controller->IsEnabled());
 }
 
 #endif  // defined(OS_CHROMEOS)