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

Unified Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 2426473009: mash: Place views Wi-Fi network config dialogs in correct window parent (Closed)
Patch Set: rebase Created 4 years, 2 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/status/network_menu.cc
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index 9f326b4eb53cec5608214e1ccbc7499d832e1d25..3aff2fa406ee247edce915f4a5bc7c261b531e55 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -32,6 +32,7 @@
#include "ui/chromeos/network/network_icon.h"
#include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/views/widget/widget_parent.h"
namespace chromeos {
@@ -336,10 +337,13 @@ ui::MenuModelDelegate* NetworkMenuModel::GetMenuModelDelegate() const {
void NetworkMenuModel::ShowOther(const std::string& type) const {
gfx::NativeWindow native_window = owner_->delegate()->GetNativeWindow();
- if (type == shill::kTypeCellular)
+ if (type == shill::kTypeCellular) {
ChooseMobileNetworkDialog::ShowDialog(native_window);
- else
- NetworkConfigView::ShowForType(shill::kTypeWifi, native_window);
+ } else {
+ views::WidgetParent widget_parent;
+ widget_parent.native_parent = native_window;
+ NetworkConfigView::ShowForType(shill::kTypeWifi, widget_parent);
+ }
}
////////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698