Rework FocusManager as FocusClient.

ash/wm/app_list_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_APP_LIST_CONTROLLER_H_
 #define ASH_WM_APP_LIST_CONTROLLER_H_
 
 #include "ash/launcher/launcher_icon_observer.h"
 #include "ash/shell_observer.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/timer.h"
 #include "ui/app_list/pagination_model_observer.h"
-#include "ui/aura/focus_change_observer.h"
+#include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/base/events/event_handler.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace app_list {
 class AppListView;
 class PaginationModel;
 }
 
 namespace ui {
 class LocatedEvent;
 }
 
 namespace ash {
 namespace internal {
 
 // AppListController is a controller that manages app list UI for shell.
 // It creates AppListView and schedules showing/hiding animation.
 // While the UI is visible, it monitors things such as app list widget's
 // activation state and desktop mouse click to auto dismiss the UI.
 class AppListController : public ui::EventHandler,
-                          public aura::FocusChangeObserver,
+                          public aura::client::FocusChangeObserver,
                           public aura::RootWindowObserver,
                           public ui::ImplicitAnimationObserver,
                           public views::WidgetObserver,
                           public ShellObserver,
                           public LauncherIconObserver,
                           public app_list::PaginationModelObserver {
  public:
   AppListController();
   virtual ~AppListController();
 
@@ skipping 23 matching lines @@
 
   void ProcessLocatedEvent(ui::LocatedEvent* event);
 
   // Makes app list bubble update its bounds.
   void UpdateBounds();
 
   // ui::EventHandler overrides:
   virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
   virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
-  // aura::FocusChangeObserver overrides:
+  // aura::client::FocusChangeObserver overrides:
   virtual void OnWindowFocused(aura::Window* window) OVERRIDE;
 
   // aura::RootWindowObserver overrides:
   virtual void OnRootWindowResized(const aura::RootWindow* root,
                                    const gfx::Size& old_size) OVERRIDE;
 
   // ui::ImplicitAnimationObserver overrides:
   virtual void OnImplicitAnimationsCompleted() OVERRIDE;
 
   // views::WidgetObserver overrides:
@@ skipping 24 matching lines @@
   // Whether should schedule snap back animation.
   bool should_snap_back_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListController);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_APP_LIST_CONTROLLER_H_