Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3911)

Unified Diff: ash/wm/workspace/workspace_manager2.cc

Issue 10874086: Makes sure shelf visibility is updated when the visibility of a window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/wm/workspace/workspace_manager2_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « no previous file | ash/wm/workspace/workspace_manager2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698