mash: Place views Wi-Fi network config dialogs in correct window parent

chrome/browser/chromeos/status/network_menu.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/status/network_menu.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 14 matching lines @@
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/chromeos/network/network_connect.h"
 #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 {
 
 namespace {
 
 // Offsets for views menu ids (main menu and submenu ids use the same
 // namespace).
 const int kMainIndexMask = 0x1000;
 const int kMoreIndexMask = 0x4000;
 
@@ skipping 284 matching lines @@
 
 ui::MenuModelDelegate* NetworkMenuModel::GetMenuModelDelegate() const {
   return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuModel, private methods:
 
 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);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MainMenuModel
 
 void MainMenuModel::AddWirelessNetworkMenuItem(const NetworkState* network,
                                                int flag) {
   base::string16 label;
   // Ampersand is a valid character in an SSID, but menu2 uses it to mark
   // "mnemonics" for keyboard shortcuts.
@@ skipping 320 matching lines @@
   return main_menu_model_.get();
 }
 
 void NetworkMenu::UpdateMenu() {
   refreshing_menu_ = true;
   main_menu_model_->InitMenuItems(delegate_->ShouldOpenButtonOptions());
   refreshing_menu_ = false;
 }
 
 }  // namespace chromeos