Prevent showing multiple network config views.

chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.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/options2/chromeos/internet_options_handler2.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 1033 matching lines @@
     const chromeos::MobileConfig::Carrier* carrier =
         chromeos::MobileConfig::GetInstance()->GetCarrier(carrier_id);
     if (carrier && carrier->show_portal_button()) {
       // This will trigger BuyDataPlanCallback() so that
       // chrome://mobilesetup/ will open carrier specific portal.
       dictionary->SetBoolean("showViewAccountButton", true);
     }
   }
 }
 
-void InternetOptionsHandler::CreateModalPopup(views::WidgetDelegate* view) {
-  views::Widget* window = views::Widget::CreateWindowWithParent(
-      view, GetNativeWindow());
-  window->SetAlwaysOnTop(true);
-  window->Show();
-}
-
 gfx::NativeWindow InternetOptionsHandler::GetNativeWindow() const {
   // TODO(beng): This is an improper direct dependency on Browser. Route this
   // through some sort of delegate.
   Browser* browser =
       BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui()));
   return browser->window()->GetNativeHandle();
 }
 
 Browser* InternetOptionsHandler::GetAppropriateBrowser() {
   return Browser::GetOrCreateTabbedBrowser(
@@ skipping 35 matching lines @@
 }
 
 void InternetOptionsHandler::HandleWifiButtonClick(
     const std::string& service_path,
     const std::string& command) {
   chromeos::WifiNetwork* wifi = NULL;
   if (command == "forget") {
     cros_->ForgetNetwork(service_path);
   } else if (service_path == kOtherNetworksFakePath) {
     // Other wifi networks.
-    CreateModalPopup(new chromeos::NetworkConfigView(chromeos::TYPE_WIFI));
+    chromeos::NetworkConfigView::ShowForType(
+        chromeos::TYPE_WIFI, GetNativeWindow());
   } else if ((wifi = cros_->FindWifiNetworkByPath(service_path))) {
     if (command == "connect") {
       wifi->SetEnrollmentDelegate(
           chromeos::CreateEnrollmentDelegate(GetNativeWindow(), wifi->name(),
               ProfileManager::GetLastUsedProfile()));
       wifi->AttemptConnection(base::Bind(&InternetOptionsHandler::DoConnect,
                                          weak_factory_.GetWeakPtr(),
                                          wifi));
     } else if (command == "disconnect") {
       cros_->DisconnectFromNetwork(wifi);
@@ skipping 24 matching lines @@
 
 void InternetOptionsHandler::HandleVPNButtonClick(
     const std::string& service_path,
     const std::string& command) {
   chromeos::VirtualNetwork* network = NULL;
   if (command == "forget") {
     cros_->ForgetNetwork(service_path);
   } else if (service_path == kOtherNetworksFakePath) {
     // TODO(altimofeev): verify if service_path in condition is correct.
     // Other VPN networks.
-    CreateModalPopup(new chromeos::NetworkConfigView(chromeos::TYPE_VPN));
+    chromeos::NetworkConfigView::ShowForType(
+        chromeos::TYPE_VPN, GetNativeWindow());
   } else if ((network = cros_->FindVirtualNetworkByPath(service_path))) {
     if (command == "connect") {
       network->SetEnrollmentDelegate(
           chromeos::CreateEnrollmentDelegate(
               GetNativeWindow(),
               network->name(),
               ProfileManager::GetLastUsedProfile()));
       network->AttemptConnection(base::Bind(&InternetOptionsHandler::DoConnect,
                                             weak_factory_.GetWeakPtr(),
                                             network));
     } else if (command == "disconnect") {
       cros_->DisconnectFromNetwork(network);
     } else if (command == "options") {
       PopulateDictionaryDetails(network);
     }
   }
 }
 
 void InternetOptionsHandler::DoConnect(chromeos::Network* network) {
   if (network->type() == chromeos::TYPE_VPN) {
     chromeos::VirtualNetwork* vpn =
         static_cast<chromeos::VirtualNetwork*>(network);
     if (vpn->NeedMoreInfoToConnect()) {
-      CreateModalPopup(new chromeos::NetworkConfigView(network));
+      chromeos::NetworkConfigView::Show(network, GetNativeWindow());
     } else {
       cros_->ConnectToVirtualNetwork(vpn);
       // Connection failures are responsible for updating the UI, including
       // reopening dialogs.
     }
   }
   if (network->type() == chromeos::TYPE_WIFI) {
     chromeos::WifiNetwork* wifi = static_cast<chromeos::WifiNetwork*>(network);
     if (wifi->IsPassphraseRequired()) {
       // Show the connection UI if we require a passphrase.
-      CreateModalPopup(new chromeos::NetworkConfigView(wifi));
+      chromeos::NetworkConfigView::Show(wifi, GetNativeWindow());
     } else {
       cros_->ConnectToWifiNetwork(wifi);
       // Connection failures are responsible for updating the UI, including
       // reopening dialogs.
     }
   }
 }
 
 void InternetOptionsHandler::RefreshCellularPlanCallback(
     const ListValue* args) {
@@ skipping 142 matching lines @@
   if (default_value)
     value_dict->Set("default", default_value->DeepCopy());
   if (ui_data.managed())
     value_dict->SetString("controlledBy", "policy");
   else if (ui_data.recommended())
     value_dict->SetString("controlledBy", "recommended");
   settings->Set(key, value_dict);
 }
 
 }  // namespace options2