Initial crack at new workspace behavior. Each workspace now has its

ash/wm/workspace_controller.h

Index: ash/wm/workspace_controller.h
diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h
index d7f7b6b50eb9d5d44c7c3990b1e098fca4f3cd43..46d6efb4b22cc9bb00e0b43020deb830220e6f7b 100644
--- a/ash/wm/workspace_controller.h
+++ b/ash/wm/workspace_controller.h
@@ -33,6 +33,9 @@ class ASH_EXPORT WorkspaceController
   explicit WorkspaceController(aura::Window* viewport);
   virtual ~WorkspaceController();
 
+  // Returns true if Workspace2 is enabled.
+  static bool IsWorkspace2Enabled();
+
   // Returns true if in maximized or fullscreen mode.
   bool IsInMaximizedMode() const;
 
@@ -62,6 +65,9 @@ class ASH_EXPORT WorkspaceController
 
   scoped_ptr<BaseWorkspaceManager> workspace_manager_;
 
+  // TODO(sky): remove |layout_manager_| and |event_filter_| when Workspace2
+  // is the default.
+
   // Owned by the window its attached to.
   WorkspaceLayoutManager* layout_manager_;