| Index: ash/wm/workspace/workspace_manager.cc
|
| diff --git a/ash/wm/workspace/workspace_manager.cc b/ash/wm/workspace/workspace_manager.cc
|
| index 098c4e91a52de89c20abc818d9360a171af33f14..d8f40870fb03084a08fba841acd3be26cc6b1e86 100644
|
| --- a/ash/wm/workspace/workspace_manager.cc
|
| +++ b/ash/wm/workspace/workspace_manager.cc
|
| @@ -92,7 +92,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);
|
| }
|
|
|
| bool WorkspaceManager::ShouldMaximize(aura::Window* window) const {
|
| @@ -202,10 +202,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));
|
|
|