Rework FocusManager as FocusClient.

ui/views/widget/desktop_aura/desktop_root_window_host_linux.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 "ui/views/widget/desktop_aura/desktop_root_window_host_linux.h"
 
 #include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
@@ skipping 196 matching lines @@
 
   native_widget_delegate_->OnNativeWidgetCreated();
 
   capture_client_.reset(new aura::client::DefaultCaptureClient(root_window_));
   aura::client::SetCaptureClient(root_window_, capture_client_.get());
 
   // Ensure that the X11DesktopHandler exists so that it dispatches activation
   // messages to us.
   X11DesktopHandler::get();
 
-  focus_manager_.reset(new aura::FocusManager);
-  root_window_->set_focus_manager(focus_manager_.get());
+  focus_client_.reset(new aura::FocusManager);
+  aura::client::SetFocusClient(root_window_.GetRootWindow(),
+                               focus_client_.get());
 
   activation_client_.reset(new DesktopActivationClient(root_window_));
 
   dispatcher_client_.reset(new DesktopDispatcherClient);
   aura::client::SetDispatcherClient(root_window_,
                                     dispatcher_client_.get());
 
   cursor_client_.reset(new DesktopCursorClient(root_window_));
   aura::client::SetCursorClient(root_window_,
                                 cursor_client_.get());
@@ skipping 864 matching lines @@
 DesktopRootWindowHost* DesktopRootWindowHost::Create(
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura,
     const gfx::Rect& initial_bounds) {
   return new DesktopRootWindowHostLinux(native_widget_delegate,
                                         desktop_native_widget_aura,
                                         initial_bounds);
 }
 
 }  // namespace views