Makes sure shelf visibility is updated when the visibility of a window

ash/wm/workspace/workspace_manager2_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/wm/workspace/workspace_manager2.h"
 
 #include "ash/ash_switches.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 443 matching lines @@
 // updated.
 TEST_F(WorkspaceManager2Test, ShelfStateUpdated) {
   // Since ShelfLayoutManager queries for mouse location, move the mouse so
   // it isn't over the shelf.
   aura::test::EventGenerator generator(
       Shell::GetPrimaryRootWindow(), gfx::Point());
   generator.MoveMouseTo(0, 0);
 
   scoped_ptr<Window> w1(CreateTestWindow());
   const gfx::Rect w1_bounds(0, 1, 101, 102);
+  ShelfLayoutManager* shelf = Shell::GetInstance()->shelf();
+  const gfx::Rect touches_shelf_bounds(
+      0, shelf->GetIdealBounds().y() - 10, 101, 102);
+  // Move |w1| to overlap the shelf.
+  w1->SetBounds(touches_shelf_bounds);
+  EXPECT_FALSE(GetWindowOverlapsShelf());
+
+  // Make it visible, since visible shelf overlaps should be true.
+  w1->Show();
+  EXPECT_TRUE(GetWindowOverlapsShelf());
+
+  wm::ActivateWindow(w1.get());
   w1->SetBounds(w1_bounds);
   w1->Show();
   wm::ActivateWindow(w1.get());
 
-  ShelfLayoutManager* shelf = Shell::GetInstance()->shelf();
-
   EXPECT_EQ(ShelfLayoutManager::VISIBLE, shelf->visibility_state());
 
   // Maximize the window.
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   EXPECT_EQ(ShelfLayoutManager::AUTO_HIDE, shelf->visibility_state());
   EXPECT_EQ(ShelfLayoutManager::AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
 
   // Restore.
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(ShelfLayoutManager::VISIBLE, shelf->visibility_state());
   EXPECT_EQ("0,1 101x102", w1->bounds().ToString());
 
   // Fullscreen.
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   EXPECT_EQ(ShelfLayoutManager::HIDDEN, shelf->visibility_state());
 
   // Normal.
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(ShelfLayoutManager::VISIBLE, shelf->visibility_state());
   EXPECT_EQ("0,1 101x102", w1->bounds().ToString());
   EXPECT_FALSE(GetWindowOverlapsShelf());
 
   // Move window so it obscures shelf.
-  const gfx::Rect touches_shelf_bounds(
-      0, shelf->GetIdealBounds().y() - 10, 101, 102);
   w1->SetBounds(touches_shelf_bounds);
   EXPECT_TRUE(GetWindowOverlapsShelf());
 
   // Move it back.
   w1->SetBounds(w1_bounds);
   EXPECT_FALSE(GetWindowOverlapsShelf());
 
   // Maximize again.
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   EXPECT_EQ(ShelfLayoutManager::AUTO_HIDE, shelf->visibility_state());
@@ skipping 343 matching lines @@
   EXPECT_FALSE(w1->IsVisible());
 
   // Close |w2|.
   w2.reset();
   EXPECT_EQ(1.0f, w1->layer()->GetCombinedOpacity());
   EXPECT_TRUE(w1->IsVisible());
 }
 
 }  // namespace internal
 }  // namespace ash