Renames Workspace*2 -> Workspace*.

ash/shell_window_ids.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_SHELL_WINDOW_IDS_H_
 #define ASH_SHELL_WINDOW_IDS_H_
 
 // Declarations of ids of special shell windows.
 
 namespace ash {
@@ skipping 18 matching lines @@
 // by PowerButtonController for animating lower-level containers.
 const int kShellWindowId_LockScreenRelatedContainersContainer = 2;
 
 // A container used for windows of WINDOW_TYPE_CONTROL that have no parent.
 // This container is not visible.
 const int kShellWindowId_UnparentedControlContainer = 3;
 
 // The desktop background window.
 const int kShellWindowId_DesktopBackgroundContainer = 4;
 
-// TODO(sky): rename kShellWindowId_DefaultContainer when Workspace2 is the
-// default.
+// TODO(sky): rename kShellWindowId_DefaultContainer.
 
 // The container for standard top-level windows.
-// WARNING: when Workspace2 is enabled the only children of
-// kShellWindowId_DefaultContainer are kShellWindowId_WorkspaceContainer.
+// WARNING: the only children of kShellWindowId_DefaultContainer are
+// kShellWindowId_WorkspaceContainer.
 const int kShellWindowId_DefaultContainer = 5;
 
 // Used by Worskpace2 for each workspace. Contains standard top-level windows.
 // WARNING: there may be more than one container with this id.
 const int kShellWindowId_WorkspaceContainer = 6;
 
 // The container for top-level windows with the 'always-on-top' flag set.
 const int kShellWindowId_AlwaysOnTopContainer = 7;
 
 // The container for panel windows.
@@ skipping 44 matching lines @@
 
 // The topmost container, used for power off animation.
 const int kShellWindowId_PowerButtonAnimationContainer = 22;
 
 }  // namespace internal
 
 }  // namespace ash
 
 
 #endif  // ASH_SHELL_WINDOW_IDS_H_