Add ability to have active window autohide shelf

ash/shelf/shelf_layout_manager_unittest.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 "ash/common/shelf/shelf_layout_manager.h"
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/accelerator_table.h"
 #include "ash/common/focus_cycler.h"
 #include "ash/common/session/session_controller.h"
@@ skipping 1465 matching lines @@
     generator.GestureScrollSequence(start, end,
                                     base::TimeDelta::FromMilliseconds(10), 1);
     EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
     EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
     ShelfAnimationWaiter waiter2(auto_hidden_bounds);
     waiter2.WaitTillDoneAnimating();
     EXPECT_TRUE(waiter2.WasValidAnimation());
   }
 }
 
+TEST_F(ShelfLayoutManagerTest, AutohideShelfForAutohideWhenActiveWindow) {
+  WmShelf* shelf = GetPrimaryShelf();
+
+  views::Widget* widget_one = CreateTestWidget();
+  views::Widget* widget_two = CreateTestWidget();
+  aura::Window* window_two = widget_two->GetNativeWindow();
+
+  // Turn on hide_shelf_when_active behavior for window two - shelf should
+  // still be visible when window two is made active since it is not yet
+  // maximized.
+  widget_one->Activate();
+  EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
+  wm::GetWindowState(window_two)
+      ->set_autohide_shelf_when_maximized_or_fullscreen(true);
+  widget_two->Activate();
+  EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
+
+  // Now the flag takes effect once window two is maximized.
+  widget_two->Maximize();
+  EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
+
+  // The hide_shelf_when_active flag should override the behavior of the
+  // hide_shelf_when_fullscreen flag even if the window is currently fullscreen.
+  wm::GetWindowState(window_two)->set_hide_shelf_when_fullscreen(false);
+  widget_two->SetFullscreen(true);
+  EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
+  wm::GetWindowState(window_two)->Restore();
+
+  // With the flag off, shelf no longer auto-hides.
+  widget_one->Activate();
+  EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
+  wm::GetWindowState(window_two)
+      ->set_autohide_shelf_when_maximized_or_fullscreen(false);
+  widget_two->Activate();
+  EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
+}
+
 TEST_F(ShelfLayoutManagerTest, ShelfFlickerOnTrayActivation) {
   // TODO: investigate failure in mash, http://crbug.com/695686.
   if (WmShell::Get()->IsRunningInMash())
     return;
 
   WmShelf* shelf = GetPrimaryShelf();
 
   // Create a visible window so auto-hide behavior is enforced.
   CreateTestWidget();
 
@@ skipping 313 matching lines @@
   // Open keyboard in sticky mode.
   kb_controller->ShowKeyboard(true);
   layout_manager->OnKeyboardBoundsChanging(keyboard_bounds());
 
   // Work area should be changed.
   EXPECT_NE(orig_work_area,
             display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
 }
 
 }  // namespace ash