Refactor: Shelf Widget

ash/wm/workspace/phantom_window_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/workspace/phantom_window_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 109 matching lines @@
 
 void PhantomWindowController::CreatePhantomWidget(const gfx::Rect& bounds) {
   DCHECK(!phantom_widget_);
   phantom_widget_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   params.transparent = true;
   // PhantomWindowController is used by FrameMaximizeButton to highlight the
   // launcher button. Put the phantom in the same window as the launcher so that
   // the phantom is visible.
   params.parent = Shell::GetContainer(wm::GetRootWindowMatching(bounds),
-                                      kShellWindowId_LauncherContainer);
+                                      kShellWindowId_ShelfContainer);
   params.can_activate = false;
   params.keep_on_top = true;
   phantom_widget_->set_focus_on_creation(false);
   phantom_widget_->Init(params);
   phantom_widget_->SetVisibilityChangedAnimationsEnabled(false);
   phantom_widget_->GetNativeWindow()->SetName("PhantomWindow");
   phantom_widget_->GetNativeWindow()->set_id(kShellWindowId_PhantomWindow);
   views::View* content_view = new views::View;
   content_view->set_background(
       views::Background::CreateBackgroundPainter(true, new EdgePainter));
   phantom_widget_->SetContentsView(content_view);
   phantom_widget_->SetBounds(bounds);
   if (phantom_below_window_)
     phantom_widget_->StackBelow(phantom_below_window_);
   else
     phantom_widget_->StackAbove(window_);
 
   // Show the widget after all the setups.
   phantom_widget_->Show();
 
   // Fade the window in.
   ui::Layer* widget_layer = phantom_widget_->GetNativeWindow()->layer();
   widget_layer->SetOpacity(0);
   ui::ScopedLayerAnimationSettings scoped_setter(widget_layer->GetAnimator());
   widget_layer->SetOpacity(1);
 }
 
 }  // namespace internal
 }  // namespace ash