Move some more WM functionality down into ash.

ash/wm/default_container_layout_manager.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 "ui/aura_shell/default_container_layout_manager.h"
+#include "ash/wm/default_container_layout_manager.h"
 
+#include "ash/wm/property_util.h"
 #include "ash/wm/show_state_controller.h"
+#include "ash/wm/window_util.h"
+#include "ash/wm/workspace/workspace.h"
+#include "ash/wm/workspace/workspace_manager.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
-#include "ui/aura_shell/property_util.h"
-#include "ui/aura_shell/window_util.h"
-#include "ui/aura_shell/workspace/workspace.h"
-#include "ui/aura_shell/workspace/workspace_manager.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 namespace aura_shell {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
 // DefaultContainerLayoutManager, public:
 
@@ skipping 153 matching lines @@
       adjusted_bounds = workspace->bounds();
     // Don't
     if (child->GetTargetBounds() == adjusted_bounds)
       return;
   }
   SetChildBoundsDirect(child, adjusted_bounds);
 }
 
 }  // namespace internal
 }  // namespace aura_shell