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

ash/wm/workspace_controller.cc

Index: ash/wm/workspace_controller.cc
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index c880663ac8c3c7de9b4c9084f953f65a5a55f842..3788edf3b06a8ebc510a8036ab082ea5f6f90654 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -4,6 +4,7 @@
 
 #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"
@@ -58,5 +59,17 @@ void WorkspaceController::OnWindowActivated(aura::Window* gained_active,
   }
 }
 
+void WorkspaceController::OnWindowActivationRequestCompleted(
+    aura::Window* request_active, aura::Window* actual_active) {
+  if (!request_active || request_active == actual_active)
+    return;
+  if (ash::Shell::GetInstance()->IsSystemModalWindowOpen()) {
+    // Handle the case that the requested window was not activated because
+    // of a system model window. We still want to activate the workspace
+    // of the requested window.
+    workspace_manager_->SetActiveWorkspaceByWindow(request_active);
+  }
+}
+
 }  // namespace internal
 }  // namespace ash