| 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 8794e7ee56a76fa6f1b963ad45ad9bd6935e9e0f..50446a668cad1c24c50f4928ef55734d4e4827ce 100644
|
| --- a/chrome/browser/chromeos/options/network_config_view.cc
|
| +++ b/chrome/browser/chromeos/options/network_config_view.cc
|
| @@ -178,6 +178,11 @@ views::View* NetworkConfigView::GetInitiallyFocusedView() {
|
| return child_config_view_->GetInitiallyFocusedView();
|
| }
|
|
|
| +string16 NetworkConfigView::GetWindowTitle() const {
|
| + DCHECK(!child_config_view_->GetTitle().empty());
|
| + return child_config_view_->GetTitle();
|
| +}
|
| +
|
| ui::ModalType NetworkConfigView::GetModalType() const {
|
| return ui::MODAL_TYPE_SYSTEM;
|
| }
|
| @@ -247,9 +252,8 @@ 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.
|
| - Widget* window = parent ?
|
| - Widget::CreateWindowWithParent(this, parent) :
|
| - Widget::CreateWindowWithContext(this, ash::Shell::GetActiveRootWindow());
|
| + gfx::NativeWindow context = parent ? NULL : ash::Shell::GetActiveRootWindow();
|
| + Widget* window = DialogDelegate::CreateDialogWidget(this, context, parent);
|
| window->SetAlwaysOnTop(true);
|
| window->Show();
|
| }
|
|
|