Move some more WM functionality down into ash.

ash/wm/workspace/workspace.h

 // 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.
 
-#ifndef UI_AURA_SHELL_WORKSPACE_WORKSPACE_H_
-#define UI_AURA_SHELL_WORKSPACE_WORKSPACE_H_
+#ifndef ASH_WM_WORKSPACE_H_
+#define ASH_WM_WORKSPACE_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "ui/aura_shell/aura_shell_export.h"
 #include "ui/gfx/rect.h"
 
 namespace aura {
 class Window;
@@ skipping 113 matching lines @@
   std::vector<aura::Window*> windows_;
 
   DISALLOW_COPY_AND_ASSIGN(Workspace);
 };
 
 typedef std::vector<Workspace*> Workspaces;
 
 }  // namespace internal
 }  // namespace aura_shell
 
-#endif  // UI_AURA_SHELL_WORKSPACE_WORKSPACE_H_
+#endif  // ASH_WM_WORKSPACE_H_