Hook up the FocusController behind a flag.

ash/wm/panel_layout_manager.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_PANEL_LAYOUT_MANAGER_H_
 #define ASH_WM_PANEL_LAYOUT_MANAGER_H_
 
 #include <list>
 
 #include "ash/ash_export.h"
 #include "ash/launcher/launcher_icon_observer.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window_observer.h"
+#include "ui/views/corewm/activation_change_shim.h"
 
 namespace aura {
 class Window;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace views {
@@ skipping 11 matching lines @@
 // added to that container.
 //
 // The constructor takes a |panel_container| argument which is expected to set
 // its layout manager to this instance, e.g.:
 // panel_container->SetLayoutManager(new PanelLayoutManager(panel_container));
 
 class ASH_EXPORT PanelLayoutManager
     : public aura::LayoutManager,
       public ash::LauncherIconObserver,
       public aura::WindowObserver,
-      public aura::client::ActivationChangeObserver {
+      public views::corewm::ActivationChangeShim {
  public:
   explicit PanelLayoutManager(aura::Window* panel_container);
   virtual ~PanelLayoutManager();
 
   void StartDragging(aura::Window* panel);
   void FinishDragging();
 
   void ToggleMinimize(aura::Window* panel);
 
   void SetLauncher(ash::Launcher* launcher);
@@ skipping 67 matching lines @@
   scoped_ptr<views::Widget> callout_widget_;
   base::WeakPtrFactory<PanelLayoutManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_PANEL_LAYOUT_MANAGER_H_