Refactor: Shelf Widget

ash/wm/session_state_animator.cc

Index: ash/wm/session_state_animator.cc
diff --git a/ash/wm/session_state_animator.cc b/ash/wm/session_state_animator.cc
index 82af8b3a63c3c4d0b277cc5234aba7a824718979..a1ac9ac69b29a45c7d25260750d0acb90f349531 100644
--- a/ash/wm/session_state_animator.cc
+++ b/ash/wm/session_state_animator.cc
@@ -466,7 +466,7 @@ void SessionStateAnimator::GetContainers(int container_mask,
   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
@@ -479,7 +479,7 @@ void SessionStateAnimator::GetContainers(int container_mask,
     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);
     }