Removes worskpace 1 code. Will rename next.

ash/wm/activation_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/activation_controller.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
@@ skipping 18 matching lines @@
 
 // These are the list of container ids of containers which may contain windows
 // that need to be activated in the order that they should be activated.
 const int kWindowContainerIds[] = {
     kShellWindowId_LockSystemModalContainer,
     kShellWindowId_SettingBubbleContainer,
     kShellWindowId_LockScreenContainer,
     kShellWindowId_SystemModalContainer,
     kShellWindowId_AlwaysOnTopContainer,
     kShellWindowId_AppListContainer,
-    // TODO(sky): defaultcontainer shouldn't be in the list with workspace2.
     kShellWindowId_DefaultContainer,
 
     // Panel, launcher and status are intentionally checked after other
     // containers even though these layers are higher. The user expects their
     // windows to be focused before these elements.
     kShellWindowId_PanelContainer,
     kShellWindowId_LauncherContainer,
     kShellWindowId_StatusContainer,
 };
 
 // Returns true if children of |window| can be activated.
 // These are the only containers in which windows can receive focus.
 bool SupportsChildActivation(aura::Window* window) {
-  // TODO(sky): straighten this out when workspace2 is the default.
-  // kShellWindowId_WorkspaceContainer isn't in |kWindowContainerIds| since it
-  // needs to be special cased in GetTopmostWindowToActivate().
   if (window->id() == kShellWindowId_WorkspaceContainer)
     return true;
 
   for (size_t i = 0; i < arraysize(kWindowContainerIds); i++) {
     if (window->id() == kWindowContainerIds[i] &&
-        (window->id() != kShellWindowId_DefaultContainer ||
-         !WorkspaceController::IsWorkspace2Enabled())) {
+        window->id() != kShellWindowId_DefaultContainer) {
       return true;
     }
   }
   return false;
 }
 
 bool HasModalTransientChild(aura::Window* window) {
   aura::Window::Windows::const_iterator it;
   for (it = window->transient_children().begin();
        it != window->transient_children().end();
@@ skipping 283 matching lines @@
       window = GetTopmostWindowToActivateInContainer((*iter), ignore);
     }
   }
   return window;
 }
 
 aura::Window* ActivationController::GetTopmostWindowToActivateInContainer(
     aura::Window* container,
     aura::Window* ignore) const {
   // Workspace2 has an extra level of windows that needs to be special cased.
-  if (container->id() == kShellWindowId_DefaultContainer &&
-      WorkspaceController::IsWorkspace2Enabled()) {
+  if (container->id() == kShellWindowId_DefaultContainer) {
     for (aura::Window::Windows::const_reverse_iterator i =
              container->children().rbegin();
          i != container->children().rend(); ++i) {
       if ((*i)->IsVisible()) {
         aura::Window* window = GetTopmostWindowToActivateInContainer(
             *i, ignore);
         if (window)
           return window;
       }
     }
     return NULL;
   }
   for (aura::Window::Windows::const_reverse_iterator i =
            container->children().rbegin();
        i != container->children().rend();
        ++i) {
     if (*i != ignore &&
         CanActivateWindowWithEvent(*i, NULL, CURRENT_VISIBILITY) &&
         !wm::IsWindowMinimized(*i))
       return *i;
   }
   return NULL;
 }
 
 }  // namespace internal
 }  // namespace ash