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

changes.

BUG=137342
TEST=none
R=ben@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10874086

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153530 0039d316-1c4b-4281-b951-d872f2087c98

ash/wm/workspace/workspace_manager2.cc

@@ -170,8 +170,7 @@ WorkspaceWindowState WorkspaceManager2::GetWindowState() const {
   for (Window::Windows::const_iterator i = windows.begin();
        i != windows.end(); ++i) {
     ui::Layer* layer = (*i)->layer();
-    if (!layer->GetTargetVisibility() || layer->GetTargetOpacity() == 0.0f ||
-        (*i)->id() == kShellWindowId_DesktopBackgroundContainer)
+    if (!layer->GetTargetVisibility() || layer->GetTargetOpacity() == 0.0f)
       continue;
     if (wm::IsWindowMaximized(*i)) {
       // An untracked window may still be fullscreen so we keep iterating when
@@ -428,6 +427,8 @@ void WorkspaceManager2::OnWorkspaceChildWindowVisibilityChanged(
     Window* child) {
   if (workspace->ShouldMoveToPending())
     MoveWorkspaceToPendingOrDelete(workspace, NULL, ANIMATE_NEW);
+  else if (workspace == active_workspace_)
+    UpdateShelfVisibility();
 }
 
 void WorkspaceManager2::OnWorkspaceWindowChildBoundsChanged(

ash/wm/workspace/workspace_manager2_unittest.cc

@@ -461,12 +461,22 @@ TEST_F(WorkspaceManager2Test, ShelfStateUpdated) {
 
   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.
@@ -490,8 +500,6 @@ TEST_F(WorkspaceManager2Test, ShelfStateUpdated) {
   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());