Rework FocusManager as FocusClient.

ash/display/screen_position_controller.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 "ash/display/screen_position_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/workspace_controller.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/capture_client.h"
+#include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/stacking_client.h"
-#include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 namespace {
 
 // Move all transient children to |dst_root|, including the ones in
@@ skipping 135 matching lines @@
     if (dst_root != window->GetRootWindow()) {
       int container_id = window->parent()->id();
       // All containers that uses screen coordinates must have valid window ids.
       DCHECK_GE(container_id, 0);
       // Don't move modal background.
       if (!SystemModalContainerLayoutManager::IsModalBackground(window))
         dst_container = Shell::GetContainer(dst_root, container_id);
     }
 
     if (dst_container && window->parent() != dst_container) {
-      aura::Window* focused = window->GetFocusManager()->GetFocusedWindow();
+      aura::Window* focused = aura::client::GetFocusClient(window)->
+          GetFocusedWindow();
       aura::client::ActivationClient* activation_client =
           aura::client::GetActivationClient(window->GetRootWindow());
       aura::Window* active = activation_client->GetActiveWindow();
 
       aura::WindowTracker tracker;
       if (focused)
         tracker.Add(focused);
       if (active && focused != active)
         tracker.Add(active);
 
       if (dst_container->id() == kShellWindowId_WorkspaceContainer) {
         dst_container =
             GetRootWindowController(dst_root)->workspace_controller()->
             GetParentForNewWindow(window);
       }
 
       dst_container->AddChild(window);
 
       MoveAllTransientChildrenToNewRoot(display, window);
 
       // Restore focused/active window.
-      if (tracker.Contains(focused))
-        window->GetFocusManager()->SetFocusedWindow(focused, NULL);
-      else if (tracker.Contains(active))
+      if (tracker.Contains(focused)) {
+        aura::client::GetFocusClient(window)->FocusWindow(focused, NULL);
+      } else if (tracker.Contains(active)) {
         activation_client->ActivateWindow(active);
+      }
     }
   }
 
   gfx::Point origin(bounds.origin());
   const gfx::Point display_origin = Shell::GetScreen()->GetDisplayNearestWindow(
       window).bounds().origin();
   origin.Offset(-display_origin.x(), -display_origin.y());
   window->SetBounds(gfx::Rect(origin, bounds.size()));
 }
 
 }  // internal
 }  // ash