| Index: components/constrained_window/native_web_contents_modal_dialog_manager_views.cc
|
| diff --git a/components/constrained_window/native_web_contents_modal_dialog_manager_views.cc b/components/constrained_window/native_web_contents_modal_dialog_manager_views.cc
|
| index dca66733a35f971af93be521c6980d0579b9f966..45e3a43e49088650c3d330cc1b27303e6fcf5329 100644
|
| --- a/components/constrained_window/native_web_contents_modal_dialog_manager_views.cc
|
| +++ b/components/constrained_window/native_web_contents_modal_dialog_manager_views.cc
|
| @@ -98,10 +98,7 @@ void NativeWebContentsModalDialogManagerViews::Show() {
|
| widget->GetNativeWindow()->parent()));
|
| }
|
| #endif
|
| - // Host may be NULL during tab drag on Views/Win32.
|
| - if (host_)
|
| - constrained_window::UpdateWebContentsModalDialogPosition(widget, host_);
|
| - widget->Show();
|
| + ShowWidget(widget);
|
| Focus();
|
|
|
| #if defined(USE_AURA)
|
| @@ -119,7 +116,7 @@ void NativeWebContentsModalDialogManagerViews::Hide() {
|
| suspend.reset(new wm::SuspendChildWindowVisibilityAnimations(
|
| widget->GetNativeWindow()->parent()));
|
| #endif
|
| - widget->Hide();
|
| + HideWidget(widget);
|
| }
|
|
|
| void NativeWebContentsModalDialogManagerViews::Close() {
|
| @@ -194,6 +191,19 @@ gfx::NativeWindow NativeWebContentsModalDialogManagerViews::dialog() {
|
| return dialog_;
|
| }
|
|
|
| +void NativeWebContentsModalDialogManagerViews::ShowWidget(
|
| + views::Widget* widget) {
|
| + // |host_| may be NULL during tab drag on Views/Win32.
|
| + if (host_)
|
| + constrained_window::UpdateWebContentsModalDialogPosition(widget, host_);
|
| + widget->Show();
|
| +}
|
| +
|
| +void NativeWebContentsModalDialogManagerViews::HideWidget(
|
| + views::Widget* widget) {
|
| + widget->Hide();
|
| +}
|
| +
|
| views::Widget* NativeWebContentsModalDialogManagerViews::GetWidget(
|
| gfx::NativeWindow dialog) {
|
| views::Widget* widget = views::Widget::GetWidgetForNativeWindow(dialog);
|
|
|