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

ui/views/corewm/focus_controller_unittest.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 <map>
 
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/client/activation_client.h"
@@ skipping 25 matching lines @@
     EXPECT_EQ(focus_changed_count, focus_changed_count_);
   }
 
 
  private:
   // Overridden from aura::client::ActivationChangeObserver:
   virtual void OnWindowActivated(aura::Window* gained_active,
                                  aura::Window* lost_active) OVERRIDE {
     ++activation_changed_count_;
   }
+  virtual void OnWindowActivationRequestCompleted(
+      aura::Window* request_active, aura::Window* actual_active) OVERRIDE {
+  }
 
   // Overridden from aura::client::FocusChangeObserver:
   virtual void OnWindowFocused(aura::Window* gained_focus,
                                aura::Window* lost_focus) OVERRIDE {
     ++focus_changed_count_;
   }
 
   int activation_changed_count_;
   int focus_changed_count_;
 
@@ skipping 57 matching lines @@
   virtual void OnWindowActivated(aura::Window* gained_active,
                                  aura::Window* lost_active) OVERRIDE {
     // Shift focus to a child. This should prevent the default focusing from
     // occurring in FocusController::FocusWindow().
     if (gained_active == activated_window_) {
       aura::client::FocusClient* client =
           aura::client::GetFocusClient(gained_active);
       client->FocusWindow(shift_focus_to_);
     }
   }
+  virtual void OnWindowActivationRequestCompleted(
+      aura::Window* request_active, aura::Window* actual_active)  OVERRIDE {
+  }
 
   aura::Window* activated_window_;
   aura::Window* shift_focus_to_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusShiftingActivationObserver);
 };
 
 // BaseFocusRules subclass that allows basic overrides of focus/activation to
 // be tested. This is intended more as a test that the override system works at
 // all, rather than as an exhaustive set of use cases, those should be covered
@@ skipping 817 matching lines @@
 //   activation change observer are ignored.
 DIRECT_FOCUS_CHANGE_TESTS(ShiftFocusOnActivation);
 DIRECT_FOCUS_CHANGE_TESTS(ShiftFocusOnActivationDueToHide);
 DIRECT_FOCUS_CHANGE_TESTS(NoShiftActiveOnActivation);
 
 // Clicking on a window which has capture should not result in a focus change.
 DIRECT_FOCUS_CHANGE_TESTS(NoFocusChangeOnClickOnCaptureWindow);
 
 }  // namespace corewm
 }  // namespace views