Check focusability in WindowFocusedFromInputEvent

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 280 matching lines @@
 // 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;
 
+  // Input events do not change focus if the window can not be focused.
+  virtual bool IsInputEvent() = 0;
+
   void FocusWindowById(int id) {
     aura::Window* window = root_window()->GetChildById(id);
     DCHECK(window);
     FocusWindowDirect(window);
   }
   void ActivateWindowById(int id) {
     aura::Window* window = root_window()->GetChildById(id);
     DCHECK(window);
     ActivateWindowDirect(window);
   }
@@ skipping 118 matching lines @@
     // Focus should _not_ shift to the parent of the already-focused window.
     EXPECT_EQ(11, GetFocusedWindowId());
   }
   virtual void FocusRulesOverride() OVERRIDE {
     EXPECT_EQ(NULL, GetFocusedWindow());
     FocusWindowById(11);
     EXPECT_EQ(11, GetFocusedWindowId());
 
     test_focus_rules()->set_focus_restriction(root_window()->GetChildById(211));
     FocusWindowById(12);
-    EXPECT_EQ(211, GetFocusedWindowId());
+    // Input events leave focus unchanged; direct API calls will change focus
+    // to the restricted window.
+    int focused_window = IsInputEvent() ? 11 : 211;
+    EXPECT_EQ(focused_window, GetFocusedWindowId());
 
     test_focus_rules()->set_focus_restriction(NULL);
     FocusWindowById(12);
     EXPECT_EQ(12, GetFocusedWindowId());
   }
   virtual void ActivationRulesOverride() OVERRIDE {
     ActivateWindowById(1);
     EXPECT_EQ(1, GetActiveWindowId());
     EXPECT_EQ(1, GetFocusedWindowId());
 
     aura::Window* w3 = root_window()->GetChildById(3);
     test_focus_rules()->set_focus_restriction(w3);
 
     ActivateWindowById(2);
-    // FocusRules restricts focus and activation to 3.
-    EXPECT_EQ(3, GetActiveWindowId());
-    EXPECT_EQ(3, GetFocusedWindowId());
+    // Input events leave activation unchanged; direct API calls will activate
+    // the restricted window.
+    int active_window = IsInputEvent() ? 1 : 3;
+    EXPECT_EQ(active_window, GetActiveWindowId());
+    EXPECT_EQ(active_window, GetFocusedWindowId());
 
     test_focus_rules()->set_focus_restriction(NULL);
     ActivateWindowById(2);
     EXPECT_EQ(2, GetActiveWindowId());
     EXPECT_EQ(2, GetFocusedWindowId());
   }
   virtual void ShiftFocusOnActivation() OVERRIDE {
     // When a window is activated, by default that window is also focused.
     // An ActivationChangeObserver may shift focus to another window within the
     // same activatable window.
@@ skipping 99 matching lines @@
   // Overridden from FocusControllerTestBase:
   virtual void FocusWindowDirect(aura::Window* window) OVERRIDE {
     FocusWindow(window);
   }
   virtual void ActivateWindowDirect(aura::Window* window) OVERRIDE {
     ActivateWindow(window);
   }
   virtual void DeactivateWindowDirect(aura::Window* window) OVERRIDE {
     DeactivateWindow(window);
   }
+  virtual bool IsInputEvent() OVERRIDE { return false; }
 
   DISALLOW_COPY_AND_ASSIGN(FocusControllerApiTest);
 };
 
 // Focus and Activation changes via input events.
 class FocusControllerMouseEventTest : public FocusControllerDirectTestBase {
  public:
   FocusControllerMouseEventTest() {}
 
  private:
   // Overridden from FocusControllerTestBase:
   virtual void FocusWindowDirect(aura::Window* window) OVERRIDE {
     aura::test::EventGenerator generator(root_window(), window);
     generator.ClickLeftButton();
   }
   virtual void ActivateWindowDirect(aura::Window* window) OVERRIDE {
     aura::test::EventGenerator generator(root_window(), window);
     generator.ClickLeftButton();
   }
   virtual void DeactivateWindowDirect(aura::Window* window) OVERRIDE {
     aura::Window* next_activatable =
         test_focus_rules()->GetNextActivatableWindow(window);
     aura::test::EventGenerator generator(root_window(), next_activatable);
     generator.ClickLeftButton();
   }
+  virtual bool IsInputEvent() OVERRIDE { return true; }
 
   DISALLOW_COPY_AND_ASSIGN(FocusControllerMouseEventTest);
 };
 
 class FocusControllerGestureEventTest : public FocusControllerDirectTestBase {
  public:
   FocusControllerGestureEventTest() {}
 
  private:
   // Overridden from FocusControllerTestBase:
   virtual void FocusWindowDirect(aura::Window* window) OVERRIDE {
     aura::test::EventGenerator generator(root_window(), window);
     generator.GestureTapAt(window->bounds().CenterPoint());
   }
   virtual void ActivateWindowDirect(aura::Window* window) OVERRIDE {
     aura::test::EventGenerator generator(root_window(), window);
     generator.GestureTapAt(window->bounds().CenterPoint());
   }
   virtual void DeactivateWindowDirect(aura::Window* window) OVERRIDE {
     aura::Window* next_activatable =
         test_focus_rules()->GetNextActivatableWindow(window);
     aura::test::EventGenerator generator(root_window(), next_activatable);
     generator.GestureTapAt(window->bounds().CenterPoint());
   }
+  virtual bool IsInputEvent() OVERRIDE { return true; }
 
   DISALLOW_COPY_AND_ASSIGN(FocusControllerGestureEventTest);
 };
 
 // Test base for tests where focus is implicitly set to a window as the result
 // of a disposition change to the focused window or the hierarchy that contains
 // it.
 class FocusControllerImplicitTestBase : public FocusControllerTestBase {
  protected:
   explicit FocusControllerImplicitTestBase(bool parent) : parent_(parent) {}
@@ skipping 304 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