Renames Workspace*2 -> Workspace*.

ash/wm/workspace/workspace.h

Index: ash/wm/workspace/workspace.h
===================================================================
--- ash/wm/workspace/workspace.h	(revision 165163)
+++ ash/wm/workspace/workspace.h	(working copy)
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_WORKSPACE_WORKSPACE2_H_
-#define ASH_WM_WORKSPACE_WORKSPACE2_H_
+#ifndef ASH_WM_WORKSPACE_WORKSPACE_H_
+#define ASH_WM_WORKSPACE_WORKSPACE_H_
 
 #include <vector>
 
@@ -23,18 +23,18 @@
 namespace internal {
 
 class WorkspaceEventHandler;
-class WorkspaceLayoutManager2;
-class WorkspaceManager2;
+class WorkspaceLayoutManager;
+class WorkspaceManager;
 
 // Workspace is used to maintain either a single maximized windows (including
 // transients and other windows) or any number of windows (for the
 // desktop). Workspace is used by WorkspaceManager to manage a set of windows.
-class ASH_EXPORT Workspace2 {
+class ASH_EXPORT Workspace {
  public:
-  Workspace2(WorkspaceManager2* manager,
-             aura::Window* parent,
-             bool is_maximized);
-  ~Workspace2();
+  Workspace(WorkspaceManager* manager,
+            aura::Window* parent,
+            bool is_maximized);
+  ~Workspace();
 
   // Resets state. This should be used before destroying the Workspace.
   aura::Window* ReleaseWindow();
@@ -43,17 +43,17 @@
 
   aura::Window* window() { return window_; }
 
-  const WorkspaceLayoutManager2* workspace_layout_manager() const {
+  const WorkspaceLayoutManager* workspace_layout_manager() const {
     return workspace_layout_manager_;
   }
-  WorkspaceLayoutManager2* workspace_layout_manager() {
+  WorkspaceLayoutManager* workspace_layout_manager() {
     return workspace_layout_manager_;
   }
 
-  const WorkspaceManager2* workspace_manager() const {
+  const WorkspaceManager* workspace_manager() const {
     return workspace_manager_;
   }
-  WorkspaceManager2* workspace_manager() { return workspace_manager_; }
+  WorkspaceManager* workspace_manager() { return workspace_manager_; }
 
   // Returns true if the Workspace should be moved to pending. This is true
   // if there are no visible maximized windows.
@@ -67,19 +67,19 @@
   // Is this a workspace for maximized windows?
   const bool is_maximized_;
 
-  WorkspaceManager2* workspace_manager_;
+  WorkspaceManager* workspace_manager_;
 
   // Our Window, owned by |parent| passed to the constructor.
   aura::Window* window_;
 
   scoped_ptr<WorkspaceEventHandler> event_handler_;
 
-  WorkspaceLayoutManager2* workspace_layout_manager_;
+  WorkspaceLayoutManager* workspace_layout_manager_;
 
-  DISALLOW_COPY_AND_ASSIGN(Workspace2);
+  DISALLOW_COPY_AND_ASSIGN(Workspace);
 };
 
 }  // namespace internal
 }  // namespace ash
 
-#endif  // ASH_WM_WORKSPACE_WORKSPACE2_H_
+#endif  // ASH_WM_WORKSPACE_WORKSPACE_H_