Removes worskpace 1 code. Will rename next.

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/desktop_background/desktop_background_widget_controller.h"
 #include "ash/display/display_controller.h"
@@ skipping 89 matching lines @@
   // 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.
-  if (internal::WorkspaceController::IsWorkspace2Enabled()) {
-    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);
-    }
+  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];
-    if (id == internal::kShellWindowId_DefaultContainer &&
-        internal::WorkspaceController::IsWorkspace2Enabled())
+    if (id == internal::kShellWindowId_DefaultContainer)
       continue;
 
     aura::Window* src_container = Shell::GetContainer(src, id);
     aura::Window* dst_container = Shell::GetContainer(dst, id);
     aura::Window::Windows children = src_container->children();
     for (aura::Window::Windows::iterator iter = children.begin();
          iter != children.end(); ++iter) {
       aura::Window* window = *iter;
       // Don't move modal screen.
       if (internal::SystemModalContainerLayoutManager::IsModalBackground(
@@ skipping 212 matching lines @@
 
   while (!root_window_->children().empty()) {
     aura::Window* child = root_window_->children()[0];
     delete child;
   }
 
   // All containers are deleted, so reset shelf_.
   shelf_ = NULL;
 }
 
-bool RootWindowController::IsInMaximizedMode() const {
-  return workspace_controller_->IsInMaximizedMode();
-}
-
 void RootWindowController::MoveWindowsTo(aura::RootWindow* dst) {
   aura::Window* focused = dst->GetFocusManager()->GetFocusedWindow();
   aura::WindowTracker tracker;
   if (focused)
     tracker.Add(focused);
   aura::client::ActivationClient* activation_client =
       aura::client::GetActivationClient(dst);
   aura::Window* active = activation_client->GetActiveWindow();
   if (active && focused != active)
     tracker.Add(active);
@@ skipping 84 matching lines @@
       root_window);
 
   CreateContainer(kShellWindowId_UnparentedControlContainer,
                   "UnparentedControlContainer",
                   non_lock_screen_containers);
 
   aura::Window* default_container = CreateContainer(
       kShellWindowId_DefaultContainer,
       "DefaultContainer",
       non_lock_screen_containers);
-  if (!WorkspaceController::IsWorkspace2Enabled()) {
-    default_container_handler_.reset(
-        new ToplevelWindowEventHandler(default_container));
-  }
   SetChildWindowVisibilityChangesAnimated(default_container);
   SetUsesScreenCoordinates(default_container);
 
   aura::Window* always_on_top_container = CreateContainer(
       kShellWindowId_AlwaysOnTopContainer,
       "AlwaysOnTopContainer",
       non_lock_screen_containers);
   always_on_top_container_handler_.reset(
       new ToplevelWindowEventHandler(always_on_top_container));
   SetChildWindowVisibilityChangesAnimated(always_on_top_container);
@@ skipping 85 matching lines @@
 
   aura::Window* overlay_container = CreateContainer(
       kShellWindowId_OverlayContainer,
       "OverlayContainer",
       lock_screen_related_containers);
   SetUsesScreenCoordinates(overlay_container);
 }
 
 }  // namespace internal
 }  // namespace ash