Index: ash/wm/workspace/workspace_manager2.cc |
diff --git a/ash/wm/workspace/workspace_manager2.cc b/ash/wm/workspace/workspace_manager2.cc |
index e57150eae99643487fb59e6400cee40e4d9278ef..bc3903939c3c8c6f086db20410f03cb6af34199b 100644 |
--- a/ash/wm/workspace/workspace_manager2.cc |
+++ b/ash/wm/workspace/workspace_manager2.cc |
@@ -169,8 +169,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 |
@@ -413,6 +412,8 @@ void WorkspaceManager2::OnWorkspaceChildWindowVisibilityChanged( |
Window* child) { |
if (workspace->ShouldMoveToPending()) |
MoveWorkspaceToPendingOrDelete(workspace, NULL, ANIMATE_NEW); |
+ else if (workspace == active_workspace_) |
+ UpdateShelfVisibility(); |
} |
void WorkspaceManager2::OnWorkspaceWindowChildBoundsChanged( |