Rework FocusManager as FocusClient.

ui/views/widget/desktop_aura/desktop_native_widget_aura.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_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/stacking_client.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
@@ skipping 433 matching lines @@
 void DesktopNativeWidgetAura::OnFocus(aura::Window* old_focused_window) {
   desktop_root_window_host_->OnNativeWidgetFocus();
   native_widget_delegate_->OnNativeFocus(old_focused_window);
 }
 
 void DesktopNativeWidgetAura::OnBlur() {
   if (GetWidget()->HasFocusManager())
     GetWidget()->GetFocusManager()->StoreFocusedView();
   desktop_root_window_host_->OnNativeWidgetBlur();
   native_widget_delegate_->OnNativeBlur(
-      window_->GetFocusManager()->GetFocusedWindow());
+      aura::client::GetFocusClient(window_)->GetFocusedWindow());
 }
 
 gfx::NativeCursor DesktopNativeWidgetAura::GetCursor(const gfx::Point& point) {
   return gfx::kNullCursor;
 }
 
 int DesktopNativeWidgetAura::GetNonClientComponent(
     const gfx::Point& point) const {
   return native_widget_delegate_->GetNonClientComponent(point);
 }
@@ skipping 126 matching lines @@
     GetWidget()->non_client_view()->SchedulePaint();
 }
 
 void DesktopNativeWidgetAura::OnLostActive() {
   native_widget_delegate_->OnNativeWidgetActivationChanged(false);
   if (IsVisible() && GetWidget()->non_client_view())
     GetWidget()->non_client_view()->SchedulePaint();
 }
 
 }  // namespace views