Changes all non-workspace code to talk to WorkspaceManager via

ash/wm/workspace/workspace_manager.h

 // Copyright (c) 2012 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 ASH_WM_WORKSPACE_MANAGER_H_
 #define ASH_WM_WORKSPACE_MANAGER_H_
 
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/wm/workspace/workspace.h"
+#include "ash/wm/workspace/workspace_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/size.h"
 
 namespace aura {
 class Window;
 }
 
 namespace gfx {
 class Point;
 class Rect;
 }
 
 namespace ash {
 namespace internal {
 
 class ShelfLayoutManager;
 class WorkspaceManagerTest;
 
 // WorkspaceManager manages multiple workspaces in the desktop.
 class ASH_EXPORT WorkspaceManager {
  public:
-  enum WindowState {
-    // There's a full screen window.
-    WINDOW_STATE_FULL_SCREEN,
-
-    // There's a maximized window.
-    WINDOW_STATE_MAXIMIZED,
-
-    // At least one window overlaps the shelf.
-    WINDOW_STATE_WINDOW_OVERLAPS_SHELF,
-
-    // None of the windows are fullscreen, maximized or touch the shelf.
-    WINDOW_STATE_DEFAULT,
-  };
-
   explicit WorkspaceManager(aura::Window* viewport);
   virtual ~WorkspaceManager();
 
   // Returns true if |window| should be managed by the WorkspaceManager. Use
   // Contains() to test if the Window is currently managed by WorkspaceManager.
   static bool ShouldManageWindow(aura::Window* window);
 
   // Returns true if |window| has been added to this WorkspaceManager.
   bool Contains(aura::Window* window) const;
 
@@ skipping 22 matching lines @@
   // size of the grid.
   void set_grid_size(int size) { grid_size_ = size; }
   int grid_size() const { return grid_size_; }
 
   void set_shelf(ShelfLayoutManager* shelf) { shelf_ = shelf; }
 
   // Updates the visibility and whether any windows overlap the shelf.
   void UpdateShelfVisibility();
 
   // Returns the current window state.
-  WindowState GetWindowState();
+  WorkspaceWindowState GetWindowState() const;
 
   // Invoked when the show state of the specified window changes.
   void ShowStateChanged(aura::Window* window);
 
  private:
   // Enumeration of whether windows should animate or not.
   enum AnimateChangeType {
     ANIMATE,
     DONT_ANIMATE
   };
@@ skipping 62 matching lines @@
   // Owned by the Shell container window LauncherContainer. May be NULL.
   ShelfLayoutManager* shelf_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_MANAGER_H_