Removes worskpace 1 code. Will rename next.

ash/shell.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/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 40 matching lines @@
 #include "ash/wm/system_gesture_event_filter.h"
 #include "ash/wm/system_modal_container_event_filter.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/user_activity_detector.h"
 #include "ash/wm/video_detector.h"
 #include "ash/wm/visibility_controller.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_modality_controller.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/user_action_client.h"
 #include "ui/aura/display_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/root_window.h"
@@ skipping 660 matching lines @@
   if (user_action_client_.get())
     aura::client::SetUserActionClient(root_window, user_action_client_.get());
 
   root_window->SetCursor(ui::kCursorPointer);
   controller->InitLayoutManagers();
 
   // TODO(oshima): Move the instance to RootWindowController when
   // the extended desktop is enabled by default.
   internal::AlwaysOnTopController* always_on_top_controller =
       new internal::AlwaysOnTopController;
-  always_on_top_controller->SetContainers(
-      root_window->GetChildById(internal::kShellWindowId_DefaultContainer),
+  always_on_top_controller->SetAlwaysOnTopContainer(
       root_window->GetChildById(internal::kShellWindowId_AlwaysOnTopContainer));
   root_window->SetProperty(internal::kAlwaysOnTopControllerKey,
                            always_on_top_controller);
   if (GetPrimaryRootWindowController()->GetSystemModalLayoutManager(NULL)->
           has_modal_background()) {
     controller->GetSystemModalLayoutManager(NULL)->CreateModalBackground();
   }
 
   window_cycle_controller_->OnRootWindowAdded(root_window);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, private:
 
 bool Shell::CanWindowReceiveEvents(aura::Window* window) {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowControllerList::iterator iter = controllers.begin();
        iter != controllers.end(); ++iter) {
     if ((*iter)->GetSystemModalLayoutManager(window)->
             CanWindowReceiveEvents(window)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace ash