Rework FocusManager as FocusClient.

content/shell/shell_stacking_client_ash.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 CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_
 #define CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/stacking_client.h"
 
 namespace aura {
 class RootWindow;
 class Window;
 namespace client {
 class DefaultCaptureClient;
+class FocusClient;
 }
 namespace test {
 class TestActivationClient;
 }
 }
 
 namespace gfx {
 class Rect;
 }
 
@@ skipping 21 matching lines @@
 
  private:
   scoped_ptr<aura::RootWindow> root_window_;
 
   // Owned by RootWindow
   views::corewm::CompoundEventFilter* root_window_event_filter_;
 
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
   scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_;
   scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
+  scoped_ptr<aura::client::FocusClient> focus_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellStackingClientAsh);
 };
 
 }  // namespace content;
 
 #endif  // CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_