Prevent showing multiple network config views.

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 <algorithm>
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 1007 matching lines @@
       net::EscapeUrlEncodedData(network_name, false).c_str());
   browser->ShowOptionsTab(page);
 }
 
 void NetworkMenu::DoConnect(Network* network) {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   if (network->type() == TYPE_VPN) {
     VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network);
     if (vpn->NeedMoreInfoToConnect()) {
       // Show the connection UI if info for a field is missing.
-      NetworkConfigView* view = new NetworkConfigView(vpn);
-      views::Widget* window = views::Widget::CreateWindowWithParent(
-          view, delegate()->GetNativeWindow());
-      window->SetAlwaysOnTop(true);
-      window->Show();
+      NetworkConfigView::Show(vpn, delegate()->GetNativeWindow());
     } else {
       cros->ConnectToVirtualNetwork(vpn);
       // Connection failures are responsible for updating the UI, including
       // reopening dialogs.
     }
-  }
-  if (network->type() == TYPE_WIFI) {
+  } else if (network->type() == TYPE_WIFI) {
     WifiNetwork* wifi = static_cast<WifiNetwork*>(network);
     if (wifi->IsPassphraseRequired()) {
       // Show the connection UI if we require a passphrase.
-      NetworkConfigView* view = new NetworkConfigView(wifi);
-      views::Widget* window = views::Widget::CreateWindowWithParent(
-          view, delegate()->GetNativeWindow());
-      window->SetAlwaysOnTop(true);
-      window->Show();
+      NetworkConfigView::Show(wifi, delegate()->GetNativeWindow());
     } else {
       cros->ConnectToWifiNetwork(wifi);
       // Connection failures are responsible for updating the UI, including
       // reopening dialogs.
     }
   }
 }
 
 void NetworkMenu::ToggleWifi() {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
@@ skipping 26 matching lines @@
     } else {
       cros->EnableCellularNetworkDevice(!cros->cellular_enabled());
     }
   } else {
     SimDialogDelegate::ShowDialog(delegate()->GetNativeWindow(),
                                   SimDialogDelegate::SIM_DIALOG_UNLOCK);
   }
 }
 
 void NetworkMenu::ShowOtherWifi() {
-  NetworkConfigView* view = new NetworkConfigView(TYPE_WIFI);
-  views::Widget* window = views::Widget::CreateWindowWithParent(
-      view, delegate_->GetNativeWindow());
-  window->SetAlwaysOnTop(true);
-  window->Show();
+  NetworkConfigView::ShowForType(TYPE_WIFI, delegate_->GetNativeWindow());
 }
 
 void NetworkMenu::ShowOtherCellular() {
   ChooseMobileNetworkDialog::ShowDialog(delegate_->GetNativeWindow());
 }
 
 bool NetworkMenu::ShouldHighlightNetwork(const Network* network) {
   return ::ShouldHighlightNetwork(network);
 }
 
 Browser* NetworkMenu::GetAppropriateBrowser() const {
   DCHECK(chromeos::UserManager::Get()->IsSessionStarted());
   return Browser::GetOrCreateTabbedBrowser(
       ProfileManager::GetDefaultProfileOrOffTheRecord());
 }
 
 }  // namespace chromeos