Move some more WM functionality down into ash.

ash/wm/show_state_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/show_state_controller.h"
 
+#include "ash/wm/property_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/window.h"
-#include "ui/aura_shell/property_util.h"
-#include "ui/aura_shell/workspace/workspace.h"
-#include "ui/aura_shell/workspace/workspace_manager.h"
 #include "ui/base/ui_base_types.h"
 
 namespace aura_shell {
 namespace internal {
 
 ShowStateController::ShowStateController(
     WorkspaceManager* workspace_manager)
     : workspace_manager_(workspace_manager) {
 }
 
@@ skipping 16 matching lines @@
     // Store the restore bounds only if previous state is normal.
     DCHECK(window->GetProperty(aura::client::kRestoreBoundsKey) == NULL);
     SetRestoreBounds(window, window->GetTargetBounds());
   }
 
   workspace_manager_->FindBy(window)->Layout(window);
 }
 
 }  // namespace internal
 }  // namespace aura_shell