Renames Workspace*2 -> Workspace*.

ash/wm/workspace/workspace.cc

Index: ash/wm/workspace/workspace.cc
===================================================================
--- ash/wm/workspace/workspace.cc	(revision 165163)
+++ ash/wm/workspace/workspace.cc	(working copy)
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/wm/workspace/workspace2.h"
+#include "ash/wm/workspace/workspace.h"
 
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
@@ -10,16 +10,16 @@
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_handler.h"
-#include "ash/wm/workspace/workspace_layout_manager2.h"
-#include "ash/wm/workspace/workspace_manager2.h"
+#include "ash/wm/workspace/workspace_layout_manager.h"
+#include "ash/wm/workspace/workspace_manager.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace internal {
 
-Workspace2::Workspace2(WorkspaceManager2* manager,
-                       aura::Window* parent,
-                       bool is_maximized)
+Workspace::Workspace(WorkspaceManager* manager,
+                     aura::Window* parent,
+                     bool is_maximized)
     : is_maximized_(is_maximized),
       workspace_manager_(manager),
       window_(new aura::Window(NULL)),
@@ -39,16 +39,16 @@
 
   // The layout-manager cannot be created in the initializer list since it
   // depends on the window to have been initialized.
-  workspace_layout_manager_ = new WorkspaceLayoutManager2(this);
+  workspace_layout_manager_ = new WorkspaceLayoutManager(this);
   window_->SetLayoutManager(workspace_layout_manager_);
 }
 
-Workspace2::~Workspace2() {
+Workspace::~Workspace() {
   // ReleaseWindow() should have been invoked before we're deleted.
   DCHECK(!window_);
 }
 
-aura::Window* Workspace2::ReleaseWindow() {
+aura::Window* Workspace::ReleaseWindow() {
   // Remove the LayoutManager and EventFilter as they refer back to us and/or
   // WorkspaceManager.
   window_->SetLayoutManager(NULL);
@@ -58,7 +58,7 @@
   return window;
 }
 
-bool Workspace2::ShouldMoveToPending() const {
+bool Workspace::ShouldMoveToPending() const {
   if (!is_maximized_)
     return false;
 
@@ -68,7 +68,7 @@
     if (!GetTrackedByWorkspace(child) || !child->TargetVisibility() ||
         wm::IsWindowMinimized(child))
       continue;
-    if (WorkspaceManager2::IsMaximized(child))
+    if (WorkspaceManager::IsMaximized(child))
       return false;
 
     if (GetTrackedByWorkspace(child) && !GetPersistsAcrossAllWorkspaces(child))
@@ -77,13 +77,13 @@
   return !has_visible_non_maximized_window;
 }
 
-int Workspace2::GetNumMaximizedWindows() const {
+int Workspace::GetNumMaximizedWindows() const {
   int count = 0;
   for (size_t i = 0; i < window_->children().size(); ++i) {
     aura::Window* child = window_->children()[i];
     if (GetTrackedByWorkspace(child) &&
-        (WorkspaceManager2::IsMaximized(child) ||
-         WorkspaceManager2::WillRestoreMaximized(child))) {
+        (WorkspaceManager::IsMaximized(child) ||
+         WorkspaceManager::WillRestoreMaximized(child))) {
       if (++count == 2)
         return count;
     }