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

ash/wm/workspace_controller.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_CONTROLLER_H_
 #define ASH_WM_WORKSPACE_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "ash/wm/workspace/workspace_types.h"
 #include "base/basictypes.h"
@@ skipping 15 matching lines @@
 
 // WorkspaceController acts as a central place that ties together all the
 // various workspace pieces: WorkspaceManager, WorkspaceLayoutManager and
 // WorkspaceEventFilter.
 class ASH_EXPORT WorkspaceController
     : public aura::client::ActivationChangeObserver {
  public:
   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;
 
   // Sets the size of the grid.
   void SetGridSize(int grid_size);
   int GetGridSize() const;
 
   // Returns the current window state.
   WorkspaceWindowState GetWindowState() const;
 
   void SetShelf(ShelfLayoutManager* shelf);
 
   // Sets the active workspace based on |window|.
   void SetActiveWorkspaceByWindow(aura::Window* window);
 
   // See description in BaseWorkspaceManager::GetParentForNewWindow().
   aura::Window* GetParentForNewWindow(aura::Window* window);
 
   // aura::client::ActivationChangeObserver overrides:
   virtual void OnWindowActivated(aura::Window* window,
                                  aura::Window* old_active) OVERRIDE;
 
  private:
   friend class WorkspaceControllerTestHelper;
 
   aura::Window* viewport_;
 
   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_;
 
   // Owned by |viewport_|.
   WorkspaceEventFilter* event_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceController);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_CONTROLLER_H_