Index: ash/wm/workspace/workspace_manager.cc |
=================================================================== |
--- ash/wm/workspace/workspace_manager.cc (revision 124386) |
+++ ash/wm/workspace/workspace_manager.cc (working copy) |
@@ -88,7 +88,7 @@ |
bool WorkspaceManager::IsManagedWindow(aura::Window* window) const { |
return window->type() == aura::client::WINDOW_TYPE_NORMAL && |
- !window->transient_parent() && ash::GetTrackedByWorkspace(window); |
+ !window->transient_parent(); |
} |
void WorkspaceManager::AddWindow(aura::Window* window) { |
@@ -186,9 +186,12 @@ |
void WorkspaceManager::OnWindowPropertyChanged(aura::Window* window, |
const void* key, |
intptr_t old) { |
- if (key != aura::client::kShowStateKey || !IsManagedWindow(window)) |
+ if (!IsManagedWindow(window)) |
return; |
+ if (key != aura::client::kShowStateKey) |
+ return; |
+ |
DCHECK(FindBy(window)); |
Workspace::Type old_type = FindBy(window)->type(); |