Move some more WM functionality down into ash.

ash/wm/activation_controller.cc

 // Copyright (c) 2011 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/wm/activation_controller.h"
 
+#include "ash/wm/window_util.h"
 #include "base/auto_reset.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_window_ids.h"
-#include "ui/aura_shell/window_util.h"
 
 namespace aura_shell {
 namespace internal {
 namespace {
 
 aura::Window* GetContainer(int id) {
   return Shell::GetInstance()->GetContainer(id);
 }
 
 // Returns true if children of |window| can be activated.
@@ skipping 153 matching lines @@
        i != container->children().rend();
        ++i) {
     if (*i != ignore && CanActivateWindow(*i))
       return *i;
   }
   return NULL;
 }
 
 }  // namespace internal
 }  // namespace aura_shell