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

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

Issue 10392097: Prevent showing multiple network config views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 40f0b5414326d06c4ee01a0724d471367c618686..b1b93c67aad9d6f5944fa673ef85102d5e31e0a1 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -1025,26 +1025,17 @@ void NetworkMenu::DoConnect(Network* network) {
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
@@ -1091,11 +1082,7 @@ void NetworkMenu::ToggleCellular() {
}
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() {

Powered by Google App Engine
This is Rietveld 408576698