Makes FocusdController honor focus change if no previously active window

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 287 matching lines @@
   virtual void ShiftFocusWithinActiveWindow() {}
   virtual void ShiftFocusToChildOfInactiveWindow() {}
   virtual void ShiftFocusToParentOfFocusedWindow() {}
   virtual void FocusRulesOverride() = 0;
   virtual void ActivationRulesOverride() = 0;
   virtual void ShiftFocusOnActivation() {}
   virtual void ShiftFocusOnActivationDueToHide() {}
   virtual void NoShiftActiveOnActivation() {}
   virtual void NoFocusChangeOnClickOnCaptureWindow() {}
   virtual void ChangeFocusWhenNothingFocusedAndCaptured() {}
+  virtual void ChangeFocusWithinActivate() {}
 
  private:
   scoped_ptr<FocusController> focus_controller_;
   TestFocusRules* test_focus_rules_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusControllerTestBase);
 };
 
+// ActivationChangeObserver that attempts to focus another window on an
+// activation change.
+class TestActivationChangeObserver
+    : public aura::client::ActivationChangeObserver {
+ public:
+  TestActivationChangeObserver() : gained_active_(NULL), to_focus_(NULL) {}
+  virtual ~TestActivationChangeObserver() {}
+
+  // Sets the window to focus (|to_focus|) when a window is made active.
+  void SetWindows(aura::Window* gained_active, aura::Window* to_focus) {
+    gained_active_ = gained_active;
+    to_focus_ = to_focus;
+  }
+
+  // aura::client::ActivationChangeObserver:
+  virtual void OnWindowActivated(aura::Window* gained_active,
+                                 aura::Window* lost_active) OVERRIDE {
+    if (gained_active == gained_active_ && to_focus_) {
+      aura::Window* to_focus = to_focus_;
+      to_focus_ = NULL;
+      gained_active_ = NULL;
+      to_focus->Focus();
+    }
+  }
+
+ private:
+  aura::Window* gained_active_;
+  aura::Window* to_focus_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestActivationChangeObserver);
+};
+
 // Test base for tests where focus is directly set to a target window.
 class FocusControllerDirectTestBase : public FocusControllerTestBase {
  protected:
   FocusControllerDirectTestBase() {}
 
   // Different test types shift focus in different ways.
   virtual void FocusWindowDirect(aura::Window* window) = 0;
   virtual void ActivateWindowDirect(aura::Window* window) = 0;
   virtual void DeactivateWindowDirect(aura::Window* window) = 0;
 
@@ skipping 285 matching lines @@
     EXPECT_EQ(-1, GetFocusedWindowId());
 
     FocusWindowById(1);
 
     EXPECT_EQ(1, GetActiveWindowId());
     EXPECT_EQ(1, GetFocusedWindowId());
 
     aura::client::GetCaptureClient(root_window())->ReleaseCapture(w1);
   }
 
+  // Verifies a request to focus a window is honored if the
+  // ActivationChangeObserver changes focus.
+  virtual void ChangeFocusWithinActivate() OVERRIDE {
+    TestActivationChangeObserver test_observer;
+    aura::client::GetActivationClient(root_window())->
+        AddObserver(&test_observer);
+    // Set things such that when |w1| is made active a request is made to focus
+    // |w11|.
+    test_observer.SetWindows(root_window()->GetChildById(1),
+                             root_window()->GetChildById(11));
+    // Attempt to activate |w12|. This should activate |w1| (its the child of
+    // the root
+    ActivateWindowById(12);
+    EXPECT_EQ(1, GetActiveWindowId());
+    EXPECT_EQ(12, GetFocusedWindowId());
+    aura::client::GetActivationClient(root_window())->RemoveObserver(
+        &test_observer);
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(FocusControllerDirectTestBase);
 };
 
 // Focus and Activation changes via aura::client::ActivationClient API.
 class FocusControllerApiTest : public FocusControllerDirectTestBase {
  public:
   FocusControllerApiTest() {}
 
  private:
@@ skipping 381 matching lines @@
 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);
 
 FOCUS_CONTROLLER_TEST(FocusControllerApiTest,
                       ChangeFocusWhenNothingFocusedAndCaptured);
 
+FOCUS_CONTROLLER_TEST(FocusControllerApiTest, ChangeFocusWithinActivate);
+
 }  // namespace corewm
 }  // namespace views