| Index: chrome/browser/chromeos/options/network_config_view.cc
|
| diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc
|
| index 50446a668cad1c24c50f4928ef55734d4e4827ce..2061ea8b7398482c22454d7c2a2ac22ecb84ae21 100644
|
| --- a/chrome/browser/chromeos/options/network_config_view.cc
|
| +++ b/chrome/browser/chromeos/options/network_config_view.cc
|
| @@ -19,6 +19,7 @@
|
| #include "chrome/browser/ui/browser_finder.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/browser/ui/host_desktop.h"
|
| +#include "chrome/browser/ui/views/constrained_window_views.h"
|
| #include "grit/chromium_strings.h"
|
| #include "grit/generated_resources.h"
|
| #include "grit/locale_settings.h"
|
| @@ -252,8 +253,13 @@ void NetworkConfigView::ShowDialog(gfx::NativeWindow parent) {
|
| parent = GetDialogParent();
|
| // Failed connections may result in a pop-up with no natural parent window,
|
| // so provide a fallback context on the active display.
|
| - gfx::NativeWindow context = parent ? NULL : ash::Shell::GetActiveRootWindow();
|
| - Widget* window = DialogDelegate::CreateDialogWidget(this, context, parent);
|
| + Widget* window = NULL;
|
| + if (parent == NULL) {
|
| + window = DialogDelegate::CreateDialogWidget(
|
| + this, ash::Shell::GetActiveRootWindow(), parent);
|
| + } else {
|
| + window = CreateBrowserModalDialogViews(this, parent);
|
| + }
|
| window->SetAlwaysOnTop(true);
|
| window->Show();
|
| }
|
|
|