Refactor menu dependency on aura/wm SetShadowType

ui/views/window/dialog_delegate.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 "ui/views/window/dialog_delegate.h"
 
 #include "base/logging.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/window/dialog_client_view.h"
-#include "ui/wm/core/shadow_types.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogDelegate:
 
 DialogDelegate::~DialogDelegate() {
 }
 
 // static
 Widget* DialogDelegate::CreateDialogWidget(DialogDelegate* dialog,
                                            gfx::NativeView context,
                                            gfx::NativeView parent) {
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params;
   params.delegate = dialog;
   if (!dialog || dialog->UseNewStyleForThisDialog()) {
     params.opacity = Widget::InitParams::TRANSLUCENT_WINDOW;
     params.remove_standard_frame = true;
   }
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // Dialogs on Linux always have custom frames.
   params.remove_standard_frame = true;
 #endif
   params.context = context;
   params.parent = parent;
   params.top_level = true;
+  // TODO(msw): Add a matching shadow type and remove the bubble frame border?
+  params.shadow_type = views::Widget::InitParams::SHADOW_TYPE_NONE;
   widget->Init(params);
   return widget;
 }
 
 View* DialogDelegate::CreateExtraView() {
   return NULL;
 }
 
 View* DialogDelegate::CreateTitlebarExtraView() {
   return NULL;
@@ skipping 105 matching lines @@
   scoped_ptr<BubbleBorder> border(new BubbleBorder(
       BubbleBorder::FLOAT, BubbleBorder::SMALL_SHADOW, SK_ColorRED));
   border->set_use_theme_background_color(true);
   frame->SetBubbleBorder(border.Pass());
   DialogDelegate* delegate = widget->widget_delegate()->AsDialogDelegate();
   if (delegate) {
     View* titlebar_view = delegate->CreateTitlebarExtraView();
     if (titlebar_view)
       frame->SetTitlebarExtraView(titlebar_view);
   }
-  // TODO(msw): Add a matching shadow type and remove the bubble frame border?
-  wm::SetShadowType(widget->GetNativeWindow(), wm::SHADOW_TYPE_NONE);
   return frame;
 }
 
 bool DialogDelegate::UseNewStyleForThisDialog() const {
   return true;
 }
 
 const DialogClientView* DialogDelegate::GetDialogClientView() const {
   return GetWidget()->client_view()->AsDialogClientView();
 }
@@ skipping 26 matching lines @@
 
 const Widget* DialogDelegateView::GetWidget() const {
   return View::GetWidget();
 }
 
 View* DialogDelegateView::GetContentsView() {
   return this;
 }
 
 }  // namespace views