| Index: chrome/browser/ui/views/chrome_web_dialog_view.cc
|
| diff --git a/chrome/browser/ui/views/chrome_web_dialog_view.cc b/chrome/browser/ui/views/chrome_web_dialog_view.cc
|
| index 09507fa166c1dfbab6c0c7f54629558775361fa2..ef75f2937010064a319546d4dead9249c3cc43a8 100644
|
| --- a/chrome/browser/ui/views/chrome_web_dialog_view.cc
|
| +++ b/chrome/browser/ui/views/chrome_web_dialog_view.cc
|
| @@ -8,6 +8,11 @@
|
| #include "ui/views/controls/webview/web_dialog_view.h"
|
| #include "ui/views/widget/widget.h"
|
|
|
| +#if defined(USE_ASH)
|
| +#include "chrome/browser/ui/ash/ash_util.h"
|
| +#include "ui/aura/mus/mus_util.h"
|
| +#endif // defined(USE_ASH)
|
| +
|
| namespace chrome {
|
|
|
| // Declared in browser_dialogs.h so that others don't need to depend on our .h.
|
| @@ -16,9 +21,17 @@ gfx::NativeWindow ShowWebDialog(gfx::NativeView parent,
|
| ui::WebDialogDelegate* delegate) {
|
| views::WebDialogView* view =
|
| new views::WebDialogView(context, delegate, new ChromeWebContentsHandler);
|
| + views::Widget* widget = new views::Widget;
|
| + views::Widget::InitParams params;
|
| + params.delegate = view;
|
| // NOTE: The |parent| may be null, which will result in the default window
|
| // placement on Aura.
|
| - views::Widget* widget = views::Widget::CreateWindowWithParent(view, parent);
|
| + params.parent = parent;
|
| +#if defined(USE_ASH)
|
| + if (chrome::IsRunningInMash())
|
| + params.parent_mus = aura::GetMusWindow(parent);
|
| +#endif // defined(USE_ASH)
|
| + widget->Init(params);
|
|
|
| // Observer is needed for ChromeVox extension to send messages between content
|
| // and background scripts.
|
|
|