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

chrome/browser/ui/webui/options/chromeos/internet_options_handler.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/ui/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 20 matching lines @@
 #include "chromeos/network/network_state_handler.h"
 #include "components/onc/onc_constants.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "extensions/browser/api/vpn_provider/vpn_service.h"
 #include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/chromeos/network/network_connect.h"
+#include "ui/views/widget/widget_parent.h"
 
 namespace chromeos {
 namespace options {
 
 namespace {
 
 const char kAllowOnlyPolicyNetworksToConnect[] =
     "allowOnlyPolicyNetworksToConnect";
 
 // Keys for the initial "localized" dictionary values.
@@ skipping 132 matching lines @@
   }
   SimDialogDelegate::ShowDialog(GetNativeWindow(), mode);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 gfx::NativeWindow InternetOptionsHandler::GetNativeWindow() const {
   return web_ui()->GetWebContents()->GetTopLevelNativeWindow();
 }
 
+views::WidgetParent InternetOptionsHandler::GetWidgetParent() const {
+  views::WidgetParent widget_parent;
+  widget_parent.native_parent = GetNativeWindow();
+  return widget_parent;
+}
+
 const PrefService* InternetOptionsHandler::GetPrefs() const {
   return Profile::FromWebUI(web_ui())->GetPrefs();
 }
 
 
 void InternetOptionsHandler::AddVPNConnection(const base::ListValue* args) {
   if (args->empty()) {
     // Show the "add network" dialog for the built-in OpenVPN/L2TP provider.
-    NetworkConfigView::ShowForType(shill::kTypeVPN, GetNativeWindow());
+    NetworkConfigView::ShowForType(shill::kTypeVPN, GetWidgetParent());
     return;
   }
 
   std::string extension_id;
   if (args->GetSize() != 1 || !args->GetString(0, &extension_id)) {
     NOTREACHED();
     return;
   }
 
   // Request that the third-party VPN provider identified by |provider_id|
   // show its "add network" dialog.
   chromeos::VpnServiceFactory::GetForBrowserContext(
       GetProfileForPrimaryUser())->SendShowAddDialogToExtension(extension_id);
 }
 
 void InternetOptionsHandler::AddNonVPNConnection(const base::ListValue* args) {
   std::string onc_type;
   if (args->GetSize() != 1 || !args->GetString(0, &onc_type)) {
     NOTREACHED();
     return;
   }
   if (onc_type == ::onc::network_type::kWiFi) {
-    NetworkConfigView::ShowForType(shill::kTypeWifi, GetNativeWindow());
+    NetworkConfigView::ShowForType(shill::kTypeWifi, GetWidgetParent());
   } else if (onc_type == ::onc::network_type::kCellular) {
     ChooseMobileNetworkDialog::ShowDialog(GetNativeWindow());
   } else {
     LOG(ERROR) << "Unsupported type for AddConnection";
   }
 }
 
 void InternetOptionsHandler::ConfigureNetwork(const base::ListValue* args) {
   std::string guid;
   if (args->GetSize() < 1 || !args->GetString(0, &guid)) {
@@ skipping 21 matching lines @@
             network->third_party_vpn_provider_extension_id(), network->name());
     return;
   }
 
   // If a network is not connectable, show the enrollment dialog if available.
   if (!force_show && !network->connectable() &&
       enrollment::CreateDialog(service_path, GetNativeWindow())) {
     return;
   }
 
-  NetworkConfigView::Show(service_path, GetNativeWindow());
+  NetworkConfigView::Show(service_path, GetWidgetParent());
 }
 
 }  // namespace options
 }  // namespace chromeos