ash: Allow connecting to unlisted networks and visit the top-up url from the tray network popup.

BUG=109480
TEST=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=128462

Review URL: https://chromiumcodereview.appspot.com/9838002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128470 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 15 deletions

diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index f082018..95b32ea 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -217,8 +217,6 @@ class NetworkMenuModel : public ui::MenuModel {
   std::string carrier_id_;
 
  private:
-  // Show a NetworkConfigView modal dialog instance.
-  void ShowNetworkConfigView(NetworkConfigView* view) const;
   // Open a dialog to set up and connect to a network.
   void ShowOther(ConnectionType type) const;
 
@@ -503,20 +501,11 @@ void NetworkMenuModel::SetMenuModelDelegate(ui::MenuModelDelegate* delegate) {
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuModel, private methods:
 
-void NetworkMenuModel::ShowNetworkConfigView(NetworkConfigView* view) const {
-  views::Widget* window = browser::CreateViewsWindow(
-      owner_->delegate()->GetNativeWindow(), view, STYLE_GENERIC);
-  window->SetAlwaysOnTop(true);
-  window->Show();
-}
-
 void NetworkMenuModel::ShowOther(ConnectionType type) const {
-  if (type == TYPE_CELLULAR) {
-    ChooseMobileNetworkDialog::ShowDialog(
-        owner_->delegate()->GetNativeWindow());
-  } else {
-    ShowNetworkConfigView(new NetworkConfigView(type));
-  }
+  if (type == TYPE_CELLULAR)
+    owner_->ShowOtherCellular();
+  else
+    owner_->ShowOtherWifi();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1127,6 +1116,18 @@ void NetworkMenu::ToggleCellular() {
   }
 }
 
+void NetworkMenu::ShowOtherWifi() {
+  NetworkConfigView* view = new NetworkConfigView(TYPE_WIFI);
+  views::Widget* window = browser::CreateViewsWindow(
+      delegate_->GetNativeWindow(), view, STYLE_GENERIC);
+  window->SetAlwaysOnTop(true);
+  window->Show();
+}
+
+void NetworkMenu::ShowOtherCellular() {
+  ChooseMobileNetworkDialog::ShowDialog(delegate_->GetNativeWindow());
+}
+
 bool NetworkMenu::ShouldHighlightNetwork(const Network* network) {
   return ::ShouldHighlightNetwork(network);
 }