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

ui/views/corewm/focus_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 "ui/views/corewm/focus_controller.h"
 
 #include "base/auto_reset.h"
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
@@ skipping 143 matching lines @@
     SetActiveWindow(activatable);
 
   // If the window's ActivationChangeObserver shifted focus to a valid window,
   // we don't want to focus the window we thought would be focused by default.
   bool activation_changed_focus = last_focused_window != focused_window_;
   if (!updating_focus_ && (!activation_changed_focus || !focused_window_)) {
     if (active_window_ && focusable)
       DCHECK(active_window_->Contains(focusable));
     SetFocusedWindow(focusable);
   }
+
+  FOR_EACH_OBSERVER(aura::client::ActivationChangeObserver,
+                    activation_observers_,
+                    OnWindowActivationRequestCompleted(
+                        window, active_window_));
 }
 
 void FocusController::ResetFocusWithinActiveWindow(aura::Window* window) {
   DCHECK(window);
   if (!active_window_)
     return;
   if (!active_window_->Contains(window))
     return;
   SetFocusedWindow(window);
 }
@@ skipping 99 matching lines @@
   aura::client::FocusChangeObserver* observer =
       aura::client::GetFocusChangeObserver(lost_focus);
   if (observer)
     observer->OnWindowFocused(focused_window_, lost_focus);
   observer = aura::client::GetFocusChangeObserver(focused_window_);
   if (observer)
     observer->OnWindowFocused(focused_window_, lost_focus);
 }
 
 void FocusController::SetActiveWindow(aura::Window* window) {
   if (updating_activation_ || window == active_window_)

[sky, 2013/04/23 17:45:39]

Looking at this again could you instead add a branch here that invokes something
like OnAttemptToReactivateWindow() here? You would have to make this take the
requested window. I would also make OnAttemptToReactivateWindow() concrete (not
pure virtual) as most folks don't care about this).

[sschmitz, 2013/04/23 19:04:39]

Done.

     return;
 
   DCHECK(rules_->CanActivateWindow(window));
   if (window)
     DCHECK_EQ(window, rules_->GetActivatableWindow(window));
 
   base::AutoReset<bool> updating_activation(&updating_activation_, true);
   aura::Window* lost_activation = active_window_;
   if (active_window_ && observer_manager_.IsObserving(active_window_) &&
       focused_window_ != active_window_) {
@@ skipping 44 matching lines @@
 void FocusController::WindowFocusedFromInputEvent(aura::Window* window) {
   // Only focus |window| if it or any of its parents can be focused. Otherwise
   // FocusWindow() will focus the topmost window, which may not be the
   // currently focused one.
   if (rules_->CanFocusWindow(GetToplevelWindow(window)))
     FocusWindow(window);
 }
 
 }  // namespace corewm
 }  // namespace views