Refactor: Shelf Widget

ash/wm/ash_focus_rules.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/ash_focus_rules.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
@@ skipping 10 matching lines @@
     internal::kShellWindowId_LockScreenContainer,
     internal::kShellWindowId_SystemModalContainer,
     internal::kShellWindowId_AlwaysOnTopContainer,
     internal::kShellWindowId_AppListContainer,
     internal::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.
     internal::kShellWindowId_PanelContainer,
-    internal::kShellWindowId_LauncherContainer,
+    internal::kShellWindowId_ShelfContainer,
     internal::kShellWindowId_StatusContainer,
 };
 
 bool BelongsToContainerWithEqualOrGreaterId(const aura::Window* window,
                                             int container_id) {
   for (; window; window = window->parent()) {
     if (window->id() >= container_id)
       return true;
   }
   return false;
@@ skipping 129 matching lines @@
        i != container->children().rend();
        ++i) {
     if (*i != ignore && CanActivateWindow(*i) && !wm::IsWindowMinimized(*i))
       return *i;
   }
   return NULL;
 }
 
 }  // namespace wm
 }  // namespace ash