Index: ash/wm/workspace/workspace_manager.cc |
diff --git a/ash/wm/workspace/workspace_manager.cc b/ash/wm/workspace/workspace_manager.cc |
index 3e8d25a66fbe5e96de0730c5a5d6cd1adf818f58..b278074ab63f8f6d0331738611b19e5f3f341cc8 100644 |
--- a/ash/wm/workspace/workspace_manager.cc |
+++ b/ash/wm/workspace/workspace_manager.cc |
@@ -88,7 +88,7 @@ WorkspaceManager::~WorkspaceManager() { |
bool WorkspaceManager::IsManagedWindow(aura::Window* window) const { |
return window->type() == aura::client::WINDOW_TYPE_NORMAL && |
- !window->transient_parent(); |
+ !window->transient_parent() && ash::GetTrackedByWorkspace(window); |
} |
void WorkspaceManager::AddWindow(aura::Window* window) { |
@@ -186,10 +186,7 @@ gfx::Rect WorkspaceManager::AlignBoundsToGrid(const gfx::Rect& bounds) { |
void WorkspaceManager::OnWindowPropertyChanged(aura::Window* window, |
const void* key, |
intptr_t old) { |
- if (!IsManagedWindow(window)) |
- return; |
- |
- if (key != aura::client::kShowStateKey) |
+ if (key != aura::client::kShowStateKey || !IsManagedWindow(window)) |
return; |
DCHECK(FindBy(window)); |