Removes worskpace 1 code. Will rename next.

ash/wm/window_cycle_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/wm/window_cycle_controller.h"
 
 #include <algorithm>
 
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 87 matching lines @@
   for (size_t i = 0; i < window->children().size(); ++i)
     AddAllChildren(window->children()[i], windows);
 }
 
 // Adds the windows that can be cycled through for the specified window id to
 // |windows|.
 void AddCycleWindows(aura::RootWindow* root,
                      int container_id,
                      WindowCycleList::WindowList* windows) {
   aura::Window* container = Shell::GetContainer(root, container_id);
-  if (container_id == internal::kShellWindowId_DefaultContainer &&
-      internal::WorkspaceController::IsWorkspace2Enabled()) {
+  if (container_id == internal::kShellWindowId_DefaultContainer)
     AddWorkspace2Children(container, windows);
-  } else {
+  else
     AddAllChildren(container, windows);
-  }
 }
 
 }  // namespace
 
 //////////////////////////////////////////////////////////////////////////////
 // WindowCycleController, public:
 
 WindowCycleController::WindowCycleController(
     internal::ActivationController* activation_controller)
     : activation_controller_(activation_controller) {
@@ skipping 190 matching lines @@
   mru_windows_.remove(window);
   if (window->id() == internal::kShellWindowId_WorkspaceContainer)
     window->RemoveObserver(this);
 }
 
 void WindowCycleController::OnWindowDestroying(aura::Window* window) {
   window->RemoveObserver(this);
 }
 
 }  // namespace ash