Rework FocusManager as FocusClient.

ui/views/widget/desktop_aura/desktop_root_window_host_win.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 UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
 
 #include "ui/aura/root_window_host.h"
 #include "ui/views/views_export.h"
 #include "ui/views/widget/desktop_aura/desktop_root_window_host.h"
 #include "ui/views/win/hwnd_message_handler_delegate.h"
 
 namespace aura {
-class FocusManager;
 namespace client {
 class DefaultCaptureClient;
+class FocusClient;
 class ScreenPositionClient;
 }
 }
 
 namespace views {
 class DesktopActivationClient;
 class DesktopCursorClient;
 class DesktopDispatcherClient;
 class HWNDMessageHandler;
 namespace corewm {
@@ skipping 176 matching lines @@
   const Widget* GetWidget() const;
   HWND GetHWND() const;
 
  private:
   // We are owned by the RootWindow, but we have to have a back pointer to it.
   aura::RootWindow* root_window_;
 
   scoped_ptr<HWNDMessageHandler> message_handler_;
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
   scoped_ptr<DesktopDispatcherClient> dispatcher_client_;
-  scoped_ptr<aura::FocusManager> focus_manager_;
+  scoped_ptr<aura::client::FocusClient> focus_client_;
   // Depends on focus_manager_.
   scoped_ptr<DesktopActivationClient> activation_client_;
   scoped_ptr<corewm::InputMethodEventFilter> input_method_filter_;
 
   // TODO(beng): Consider providing an interface to DesktopNativeWidgetAura
   //             instead of providing this route back to Widget.
   internal::NativeWidgetDelegate* native_widget_delegate_;
 
   DesktopNativeWidgetAura* desktop_native_widget_aura_;
 
   aura::RootWindowHostDelegate* root_window_host_delegate_;
   aura::Window* content_window_;
 
   // In some cases, we set a screen position client on |root_window_|. If we
   // do, we're responsible for the lifetime.
   scoped_ptr<aura::client::ScreenPositionClient> position_client_;
 
   // A simple cursor client which just forwards events to the RootWindow.
   scoped_ptr<DesktopCursorClient> cursor_client_;
 
   // The RootWindow's CompoundEventFilter.
   views::corewm::CompoundEventFilter* root_window_event_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostWin);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_