Index: ash/wm/workspace_controller.cc |
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc |
index 8d378581401f3bc96bfff2a02e09dc97dcd21377..4bf03fd87907050f41d353d1de346173b1a350ce 100644 |
--- a/ash/wm/workspace_controller.cc |
+++ b/ash/wm/workspace_controller.cc |
@@ -74,7 +74,7 @@ WorkspaceWindowState WorkspaceController::GetWindowState() const { |
// An untracked window may still be fullscreen so we keep iterating when |
// we hit a maximized window. |
has_maximized_window = true; |
- } else if (window_state->IsFullscreen()) { |
+ } else if (window_state->IsFullscreen() && window_state->IsActive()) { |
oshima
2013/12/03 19:17:52
Don't we have to check if this is top most?
Windo
flackr
2013/12/03 21:32:58
Good point, done. This also no longer requires act
|
return WORKSPACE_WINDOW_STATE_FULL_SCREEN; |
} |
if (!window_overlaps_launcher && (*i)->bounds().Intersects(shelf_bounds)) |