Removes worskpace 1 code. Will rename next.

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index aa2591ada3ee382af52b8d97f06cdaa98cd6b42d..8fde5588c7edd421a629ea8406b6cbcdc618dcf4 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -59,7 +59,6 @@
 #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"
@@ -740,8 +739,7 @@ void Shell::InitRootWindowController(
   // 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);