Fleshes out the basic set of focus rules a bit more.

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_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event_handler.h"
-#include "ui/views/corewm/base_focus_rules.h"
 #include "ui/views/corewm/focus_change_event.h"
 
 namespace views {
 namespace corewm {
 
 class FocusEventsTestHandler : public ui::EventHandler,
                                public aura::WindowObserver {
  public:
   explicit FocusEventsTestHandler(aura::Window* window)
       : window_(window),
@@ skipping 50 matching lines @@
 class TestFocusRules : public BaseFocusRules {
  public:
   TestFocusRules() : focus_restriction_(NULL) {}
 
   // Restricts focus and activation to this window and its child hierarchy.
   void set_focus_restriction(aura::Window* focus_restriction) {
     focus_restriction_ = focus_restriction;
   }
 
   // Overridden from BaseFocusRules:
+  virtual bool SupportsChildActivation(aura::Window* window) OVERRIDE {
+    // In FocusControllerTests, only the RootWindow has activatable children.
+    return window->GetRootWindow() == window;
+  }
   virtual bool CanActivateWindow(aura::Window* window) OVERRIDE {
     // Restricting focus to a non-activatable child window means the activatable
     // parent outside the focus restriction is activatable.
-    bool can_activate = CanFocusOrActivate(window) ||
-       window->Contains(GetActivatableWindow(focus_restriction_));
+    bool can_activate =
+        CanFocusOrActivate(window) || window->Contains(focus_restriction_);
     return can_activate ? BaseFocusRules::CanActivateWindow(window) : false;
   }
   virtual bool CanFocusWindow(aura::Window* window) OVERRIDE {
     return CanFocusOrActivate(window) ?
         BaseFocusRules::CanFocusWindow(window) : false;
   }
   virtual aura::Window* GetActivatableWindow(aura::Window* window) OVERRIDE {
     return BaseFocusRules::GetActivatableWindow(
         CanFocusOrActivate(window) ? window : focus_restriction_);
   }
@@ skipping 629 matching lines @@
 DIRECT_FOCUS_CHANGE_TESTS(ShiftFocusToChildOfInactiveWindow);
 
 // - Verifies that FocusRules determine what can be focused.
 ALL_FOCUS_TESTS(FocusRulesOverride);
 
 // - Verifies that FocusRules determine what can be activated.
 TARGET_FOCUS_TESTS(ActivationRulesOverride);
 
 }  // namespace corewm
 }  // namespace views