Refactor: Shelf Widget

ash/wm/session_state_animator.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/session_state_animator.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 448 matching lines @@
   containers->clear();
 
   if (container_mask & DESKTOP_BACKGROUND) {
     containers->push_back(Shell::GetContainer(
         root_window,
         internal::kShellWindowId_DesktopBackgroundContainer));
   }
   if (container_mask & LAUNCHER) {
     containers->push_back(Shell::GetContainer(
         root_window,
-        internal::kShellWindowId_LauncherContainer));
+        internal::kShellWindowId_ShelfContainer));
   }
   if (container_mask & NON_LOCK_SCREEN_CONTAINERS) {
     // TODO(antrim): Figure out a way to eliminate a need to exclude launcher
     // in such way.
     aura::Window* non_lock_screen_containers = Shell::GetContainer(
         root_window,
         internal::kShellWindowId_NonLockScreenContainersContainer);
     aura::Window::Windows children = non_lock_screen_containers->children();
 
     for (aura::Window::Windows::const_iterator it = children.begin();
          it != children.end(); ++it) {
       aura::Window* window = *it;
-      if (window->id() == internal::kShellWindowId_LauncherContainer)
+      if (window->id() == internal::kShellWindowId_ShelfContainer)
         continue;
       containers->push_back(window);
     }
   }
   if (container_mask & LOCK_SCREEN_BACKGROUND) {
     containers->push_back(Shell::GetContainer(
         root_window,
         internal::kShellWindowId_LockScreenBackgroundContainer));
   }
   if (container_mask & LOCK_SCREEN_CONTAINERS) {
@@ skipping 132 matching lines @@
   foreground_->SetColor(SK_ColorWHITE);
   foreground_->GetWidget()->Show();
 }
 
 void SessionStateAnimator::DropForeground() {
   foreground_.reset();
 }
 
 }  // namespace internal
 }  // namespace ash