Removes worskpace 1 code. Will rename next.

ash/wm/workspace/workspace_manager2.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_WORKSPACE_MANAGER2_H_
 #define ASH_WM_WORKSPACE_WORKSPACE_MANAGER2_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
-#include "ash/wm/workspace/base_workspace_manager.h"
+#include "ash/wm/workspace/workspace_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "ui/base/ui_base_types.h"
 
 namespace aura {
 class Window;
 }
@@ skipping 19 matching lines @@
 class WorkspaceLayoutManager2;
 class WorkspaceManagerTest2;
 class Workspace2;
 
 // WorkspaceManager manages multiple workspaces in the desktop. Workspaces are
 // implicitly created as windows are maximized (or made fullscreen), and
 // destroyed when maximized windows are closed or restored. There is always one
 // workspace for the desktop.
 // Internally WorkspaceManager2 creates a Window for each Workspace. As windows
 // are maximized and restored they are reparented to the right Window.
-class ASH_EXPORT WorkspaceManager2
-    : public BaseWorkspaceManager,
-      public ash::ShellObserver {
+class ASH_EXPORT WorkspaceManager2 : public ash::ShellObserver {
  public:
   explicit WorkspaceManager2(aura::Window* viewport);
   virtual ~WorkspaceManager2();
 
   // Returns true if |window| is considered maximized and should exist in its
   // own workspace.
   static bool IsMaximized(aura::Window* window);
   static bool IsMaximizedState(ui::WindowShowState state);
 
   // Returns true if |window| is minimized and will restore to a maximized
   // window.
   static bool WillRestoreMaximized(aura::Window* window);
 
-  // BaseWorkspaceManager overrides:
-  virtual bool IsInMaximizedMode() const OVERRIDE;
-  virtual WorkspaceWindowState GetWindowState() const OVERRIDE;
-  virtual void SetShelf(ShelfLayoutManager* shelf) OVERRIDE;
-  virtual void SetActiveWorkspaceByWindow(aura::Window* window) OVERRIDE;
-  virtual aura::Window* GetParentForNewWindow(aura::Window* window) OVERRIDE;
-  virtual void DoInitialAnimation() OVERRIDE;
+  // Returns the current window state.
+  WorkspaceWindowState GetWindowState() const;
+
+  void SetShelf(ShelfLayoutManager* shelf);
+
+  // Activates the workspace containing |window|. Does nothing if |window| is
+  // NULL or not contained in a workspace.
+  void SetActiveWorkspaceByWindow(aura::Window* window);
+
+  // Returns the parent for |window|. This is invoked from StackingController
+  // when a new Window is being added.
+  aura::Window* GetParentForNewWindow(aura::Window* window);
+
+  // Starts the animation that occurs on first login.
+  void DoInitialAnimation();
 
   // ShellObserver overrides:
   virtual void OnAppTerminating() OVERRIDE;
 
  private:
   friend class WorkspaceLayoutManager2;
   friend class WorkspaceManager2Test;
 
   class LayoutManagerImpl;
 
@@ skipping 157 matching lines @@
   // DesktopBackgroundFadeController.
   bool creating_fade_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceManager2);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_WORKSPACE_MANAGER2_H_