Renames Workspace*2 -> Workspace*.

ash/root_window_controller.cc

 // 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.
 
 #include "ash/root_window_controller.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_widget_controller.h"
@@ skipping 88 matching lines @@
 // Reparents the appropriate set of windows from |src| to |dst|.
 void ReparentAllWindows(aura::RootWindow* src, aura::RootWindow* dst) {
   // Set of windows to move.
   const int kContainerIdsToMove[] = {
     internal::kShellWindowId_DefaultContainer,
     internal::kShellWindowId_AlwaysOnTopContainer,
     internal::kShellWindowId_SystemModalContainer,
     internal::kShellWindowId_LockSystemModalContainer,
     internal::kShellWindowId_InputMethodContainer,
   };
-  // For Workspace2 we need to manually reparent the windows. This way
-  // Workspace2 can move the windows to the appropriate workspace.
+  // For workspace windows we need to manually reparent the windows. This way
+  // workspace can move the windows to the appropriate workspace.
   std::vector<aura::Window*> windows(GetWorkspaceWindows(src));
   internal::WorkspaceController* workspace_controller =
       GetRootWindowController(dst)->workspace_controller();
   for (size_t i = 0; i < windows.size(); ++i) {
     aura::Window* new_parent =
         workspace_controller->GetParentForNewWindow(windows[i]);
     ReparentWindow(windows[i], new_parent);
   }
   for (size_t i = 0; i < arraysize(kContainerIdsToMove); i++) {
     int id = kContainerIdsToMove[i];
@@ skipping 494 matching lines @@
       "OverlayContainer",
       lock_screen_related_containers);
   SetUsesScreenCoordinates(overlay_container);
 
   CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
                   "PowerButtonAnimationContainer", root_window) ;
 }
 
 }  // namespace internal
 }  // namespace ash