Rework FocusManager as FocusClient.

ui/aura/window.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/aura/window.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 507 matching lines @@
 Window* Window::GetToplevelWindow() {
   Window* topmost_window_with_delegate = NULL;
   for (aura::Window* window = this; window != NULL; window = window->parent()) {
     if (window->delegate())
       topmost_window_with_delegate = window;
   }
   return topmost_window_with_delegate;
 }
 
 void Window::Focus() {
-  DCHECK(GetFocusManager());
-  GetFocusManager()->SetFocusedWindow(this, NULL);
+  client::FocusClient* client = client::GetFocusClient(this);
+  DCHECK(client);
+  client->FocusWindow(this, NULL);
 }
 
 void Window::Blur() {
-  DCHECK(GetFocusManager());
-  GetFocusManager()->SetFocusedWindow(NULL, NULL);
+  client::FocusClient* client = client::GetFocusClient(this);
+  DCHECK(client);
+  client->FocusWindow(NULL, NULL);
 }
 
 bool Window::HasFocus() const {
-  const FocusManager* focus_manager = GetFocusManager();
-  return focus_manager ? focus_manager->IsFocusedWindow(this) : false;
+  client::FocusClient* client = client::GetFocusClient(this);
+  return client ? client->GetFocusedWindow() == this : false;
 }
 
 bool Window::CanFocus() const {
   // NOTE: as part of focusing the window the ActivationClient may make the
   // window visible (by way of making a hidden ancestor visible). For this
   // reason we can't check visibility here and assume the client is doing it.
   if (!parent_ || (delegate_ && !delegate_->CanFocus()))
     return false;
 
   // The client may forbid certain windows from receiving focus at a given point
   // in time.
   client::EventClient* client = client::GetEventClient(GetRootWindow());
   if (client && !client->CanProcessEventsWithinSubtree(this))
     return false;
 
   return parent_->CanFocus();
 }
 
 bool Window::CanReceiveEvents() const {
   // The client may forbid certain windows from receiving events at a given
   // point in time.
   client::EventClient* client = client::GetEventClient(GetRootWindow());
   if (client && !client->CanProcessEventsWithinSubtree(this))
     return false;
 
   return parent_ && IsVisible() && parent_->CanReceiveEvents();
 }
 
-FocusManager* Window::GetFocusManager() {
-  return const_cast<FocusManager*>(
-      static_cast<const Window*>(this)->GetFocusManager());
-}
-
-const FocusManager* Window::GetFocusManager() const {
-  return parent_ ? parent_->GetFocusManager() : NULL;
-}
-
 void Window::SetCapture() {
   if (!IsVisible())
     return;
 
   RootWindow* root_window = GetRootWindow();
   if (!root_window)
     return;
   client::GetCaptureClient(root_window)->SetCapture(this);
 }
 
@@ skipping 384 matching lines @@
   bool contains_mouse = false;
   if (IsVisible()) {
     RootWindow* root_window = GetRootWindow();
     contains_mouse = root_window &&
         ContainsPointInRoot(root_window->GetLastMouseLocationInRoot());
   }
   return contains_mouse;
 }
 
 }  // namespace aura