Rework FocusManager as FocusClient.

ash/display/screen_position_controller.cc

Index: ash/display/screen_position_controller.cc
===================================================================
--- ash/display/screen_position_controller.cc	(revision 169793)
+++ ash/display/screen_position_controller.cc	(working copy)
@@ -14,8 +14,8 @@
 #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"
@@ -171,7 +171,8 @@
     }
 
     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();
@@ -193,10 +194,11 @@
       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);
+      }
     }
   }