Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(665)

Unified Diff: chrome/browser/chromeos/options/network_config_view.cc

Issue 16374006: Place browser-modal dialogs like web-contents-modal dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes and cleanup. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();
}

Powered by Google App Engine
This is Rietveld 408576698