Chromium Code Reviews| Index: ash/wm/workspace_controller.cc |
| diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc |
| index 8d378581401f3bc96bfff2a02e09dc97dcd21377..9d9966c5f3401f61b1bcff8fc7f456d1e6602fba 100644 |
| --- a/ash/wm/workspace_controller.cc |
| +++ b/ash/wm/workspace_controller.cc |
| @@ -74,7 +74,8 @@ 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 (*i == windows.back() && window_state->IsFullscreen()) { |
|
flackr
2013/12/03 22:05:55
Hang on, this check for topmost doesn't seem to be
|
| + // Only enter the full screen state if the topmost window is fullscreen. |
| return WORKSPACE_WINDOW_STATE_FULL_SCREEN; |
| } |
| if (!window_overlaps_launcher && (*i)->bounds().Intersects(shelf_bounds)) |