Hook up the FocusController behind a flag.

ash/wm/window_cycle_controller.h

 // 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.
 
 #ifndef ASH_WM_WINDOW_CYCLE_CONTROLLER_H_
 #define ASH_WM_WINDOW_CYCLE_CONTROLLER_H_
 
 #include <list>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/window_observer.h"
+#include "ui/views/corewm/activation_change_shim.h"
 
 namespace aura {
 class RootWindow;
 class Window;
+namespace client {
+class ActivationClient;
+}
 }
 
 namespace ui {
 class EventHandler;
 }
 
 namespace ash {
 
-namespace internal {
-class ActivationController;
-}
-
 class WindowCycleList;
 
 // Controls cycling through windows with the keyboard, for example, via alt-tab.
 // Windows are sorted primarily by most recently used, and then by screen order.
 // We activate windows as you cycle through them, so the order on the screen
 // may change during the gesture, but the most recently used list isn't updated
 // until the cycling ends.  Thus we maintain the state of the windows
 // at the beginning of the gesture so you can cycle through in a consistent
 // order.
 class ASH_EXPORT WindowCycleController
-    : public aura::client::ActivationChangeObserver,
+    : public views::corewm::ActivationChangeShim,
       public aura::WindowObserver {
  public:
   enum Direction {
     FORWARD,
     BACKWARD
   };
   explicit WindowCycleController(
-      internal::ActivationController* activation_controller);
+      aura::client::ActivationClient* activation_client);
   virtual ~WindowCycleController();
 
   // Returns true if cycling through windows is enabled. This is false at
   // certain times, such as when the lock screen is visible.
   static bool CanCycle();
 
   // Cycles between windows in the given |direction|. If |is_alt_down| then
   // interprets this call as the start of a multi-step cycle sequence and
   // installs a key filter to watch for alt being released.
   void HandleCycleWindow(Direction direction, bool is_alt_down);
@@ skipping 30 matching lines @@
 
   // Installs an event filter to watch for release of the alt key.
   void InstallEventFilter();
 
   // Stops the current window cycle and cleans up the event filter.
   void StopCycling();
 
   // Checks if the window represents a container whose children we track.
   static bool IsTrackedContainer(aura::Window* window);
 
-  // Overridden from ActivationChangeObserver:
+  // Overridden from views::corewm::ActivationChangeShim:
   virtual void OnWindowActivated(aura::Window* active,
                                  aura::Window* old_active) OVERRIDE;
 
   // Overridden from WindowObserver:
   virtual void OnWindowAdded(aura::Window* window) OVERRIDE;
   virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE;
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
 
   scoped_ptr<WindowCycleList> windows_;
 
   // Event handler to watch for release of alt key.
   scoped_ptr<ui::EventHandler> event_handler_;
 
   // List of windows that have been activated in containers that we cycle
   // through, sorted by most recently used.
   std::list<aura::Window*> mru_windows_;
 
-  internal::ActivationController* activation_controller_;
+  aura::client::ActivationClient* activation_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowCycleController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_WINDOW_CYCLE_CONTROLLER_H_