Hook up the FocusController behind a flag.

ash/wm/window_cycle_controller.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 "ash/wm/window_cycle_controller.h"
 
 #include <algorithm>
 
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 70 matching lines @@
   else
     AddAllChildren(container, windows);
 }
 
 }  // namespace
 
 //////////////////////////////////////////////////////////////////////////////
 // WindowCycleController, public:
 
 WindowCycleController::WindowCycleController(
-    internal::ActivationController* activation_controller)
-    : activation_controller_(activation_controller) {
-  activation_controller_->AddObserver(this);
+    aura::client::ActivationClient* activation_client)
+    : ActivationChangeShim(Shell::GetInstance()),
+      activation_client_(activation_client) {
+  activation_client_->AddObserver(this);
 }
 
 WindowCycleController::~WindowCycleController() {
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   for (Shell::RootWindowList::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     for (size_t i = 0; i < arraysize(kContainerIds); ++i) {
       aura::Window* container = Shell::GetContainer(*iter, kContainerIds[i]);
       if (container)
         container->RemoveObserver(this);
     }
     aura::Window* default_container =
         Shell::GetContainer(*iter, internal::kShellWindowId_DefaultContainer);
     if (default_container) {
       for (size_t i = 0; i < default_container->children().size(); ++i) {
         aura::Window* workspace_window = default_container->children()[i];
         DCHECK_EQ(internal::kShellWindowId_WorkspaceContainer,
                   workspace_window->id());
         workspace_window->RemoveObserver(this);
       }
     }
   }
 
-  activation_controller_->RemoveObserver(this);
+  activation_client_->RemoveObserver(this);
   StopCycling();
 }
 
 // static
 bool WindowCycleController::CanCycle() {
   // Don't allow window cycling if the screen is locked or a modal dialog is
   // open.
   return !Shell::GetInstance()->IsScreenLocked() &&
          !Shell::GetInstance()->IsSystemModalWindowOpen();
 }
@@ skipping 155 matching lines @@
   mru_windows_.remove(window);
   if (window->id() == internal::kShellWindowId_WorkspaceContainer)
     window->RemoveObserver(this);
 }
 
 void WindowCycleController::OnWindowDestroying(aura::Window* window) {
   window->RemoveObserver(this);
 }
 
 }  // namespace ash