Rework FocusManager as FocusClient.

ui/views/widget/desktop_aura/desktop_activation_client.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_activation_client.h"
 
 #include "base/auto_reset.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/client/activation_change_observer.h"
-#include "ui/aura/focus_manager.h"
+#include "ui/aura/client/focus_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 
 namespace views {
 
 DesktopActivationClient::DesktopActivationClient(aura::RootWindow* root_window)
     : root_window_(root_window),
       current_active_(NULL),
       updating_activation_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(observer_manager_(this)) {
-  root_window->GetFocusManager()->AddObserver(this);
+  aura::client::GetFocusClient(root_window_)->AddObserver(this);
   aura::client::SetActivationClient(root_window_, this);
 }
 
 DesktopActivationClient::~DesktopActivationClient() {
-  root_window_->GetFocusManager()->RemoveObserver(this);
+  aura::client::GetFocusClient(root_window_)->RemoveObserver(this);
   aura::client::SetActivationClient(root_window_, NULL);
 }
 
 void DesktopActivationClient::AddObserver(
     aura::client::ActivationChangeObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void DesktopActivationClient::RemoveObserver(
     aura::client::ActivationChangeObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void DesktopActivationClient::ActivateWindow(aura::Window* window) {
   // Prevent recursion when called from focus.
   if (updating_activation_)
     return;
 
   base::AutoReset<bool> in_activate_window(&updating_activation_, true);
   // Nothing may actually have changed.
   if (current_active_ == window)
     return;
   // The stacking client may impose rules on what window configurations can be
   // activated or deactivated.
   if (window && !CanActivateWindow(window))
     return;
   // Switch internal focus before we change the activation. Will probably cause
   // recursion.
   if (window &&
-      !window->Contains(window->GetFocusManager()->GetFocusedWindow())) {
-    window->GetFocusManager()->SetFocusedWindow(window, NULL);
+      !window->Contains(aura::client::GetFocusClient(window)->
+          GetFocusedWindow())) {
+    aura::client::GetFocusClient(window)->FocusWindow(window, NULL);
   }
 
   aura::Window* old_active = current_active_;
   current_active_ = window;
   if (window && !observer_manager_.IsObserving(window))
     observer_manager_.Add(window);
 
   FOR_EACH_OBSERVER(aura::client::ActivationChangeObserver,
                     observers_,
                     OnWindowActivated(window, old_active));
@@ skipping 58 matching lines @@
     // that path instead.
     if (child->transient_parent())
       return GetActivatableWindow(child->transient_parent());
     parent = parent->parent();
     child = child->parent();
   }
   return NULL;
 }
 
 }  // namespace views