Trying to activate a window in a workspace other than the current is ignored while a system modal d…

ash/wm/workspace_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/workspace_controller.h"
 
+#include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_manager.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace internal {
 
@@ skipping 34 matching lines @@
 }
 
 void WorkspaceController::OnWindowActivated(aura::Window* gained_active,
                                             aura::Window* lost_active) {
   if (!gained_active ||
       gained_active->GetRootWindow() == viewport_->GetRootWindow()) {
     workspace_manager_->SetActiveWorkspaceByWindow(gained_active);
   }
 }
 
+void WorkspaceController::OnAttemptToReactivateWindow(
+    aura::Window* request_active,
+    aura::Window* actual_active) {
+  if (request_active == actual_active)

[sky, 2013/04/24 14:14:53]

Why do we need this check? It seems like the only thing we care about is line
67.

[sschmitz, 2013/04/24 15:42:04]

Done.

+    return;
+  if (ash::Shell::GetInstance()->IsSystemModalWindowOpen()) {
+    // While a system model dialog is showing requests to activate a window
+    // other than that of the modal dialog fail. Outside of this function we
+    // only switch the active workspace when activation changes. That prevents
+    // the active workspace from changing while a system modal dialog is
+    // showing. This code ensures the active workspace changes even though
+    // activation doesn't change away from the system model dialog.
+    workspace_manager_->SetActiveWorkspaceByWindow(request_active);
+  }
+}
+
 }  // namespace internal
 }  // namespace ash