Push change for stevenjb:...

chrome/browser/chromeos/status/network_menu_button.cc

 // Copyright (c) 2010 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_button.h"
 
 #include <limits>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 98 matching lines @@
   } else if (flags & FLAG_ETHERNET) {
     if (cros->ethernet_connected()) {
       NetworkConfigView* view = new NetworkConfigView(cros->ethernet_network());
       view->set_browser_mode(host_->IsBrowserMode());
       views::Window* window = views::Window::CreateChromeWindow(
             host_->GetNativeWindow(), gfx::Rect(), view);
       window->SetIsAlwaysOnTop(true);
       window->Show();
     }
   } else if (flags & FLAG_WIFI) {
-    WifiNetwork wifi = menu_items_[index].wifi_network;
-
-    // If clicked on a network that we are already connected to or we are
-    // currently trying to connect to, then open config dialog.
-    if (wifi.name() == cros->wifi_name()) {
+    WifiNetwork wifi;
+    bool wifi_exists = cros->FindWifiNetworkByPath(
+        menu_items_[index].wireless_path, &wifi);
+    if (!wifi_exists) {
+      // If we are attempting to connect to a network that no longer exists,
+      // display a notification.
+      // TODO(stevenjb): Show notification.
+    } else if (wifi.name() == cros->wifi_name()) {
       if (cros->wifi_connected()) {
+        // If we are already connected, open the config dialog.
         NetworkConfigView* view = new NetworkConfigView(wifi, false);
         view->set_browser_mode(host_->IsBrowserMode());
         views::Window* window = views::Window::CreateChromeWindow(
             host_->GetNativeWindow(), gfx::Rect(), view);
         window->SetIsAlwaysOnTop(true);
         window->Show();
+      } else {
+        // TODO(stevenjb): Connection in progress. Show dialog?
       }
     } else {
       // If wifi network is not encrypted, then directly connect.
       // Otherwise, we open password dialog window.
       if (!wifi.encrypted()) {
         cros->ConnectToWifiNetwork(wifi, string16(), string16(), string16());
       } else {
         NetworkConfigView* view = new NetworkConfigView(wifi, true);
         view->set_browser_mode(host_->IsBrowserMode());
         views::Window* window = views::Window::CreateChromeWindow(
             host_->GetNativeWindow(), gfx::Rect(), view);
         window->SetIsAlwaysOnTop(true);
         window->Show();
         view->SetLoginTextfieldFocus();
       }
     }
   } else if (flags & FLAG_CELLULAR) {
-    CellularNetwork cellular = menu_items_[index].cellular_network;
+    CellularNetwork cellular;
+    bool cellular_exists = cros->FindCellularNetworkByPath(
+        menu_items_[index].wireless_path, &cellular);
 
-    // If clicked on a network that we are already connected to or we are
-    // currently trying to connect to, then open config dialog.
-    if (cellular.name() == cros->cellular_name()) {
+    if (!cellular_exists) {
+      // If we are attempting to connect to a network that no longer exists,
+      // display a notification.
+      // TODO(stevenjb): Show notification.
+    } else if (cellular.name() == cros->cellular_name()) {
+      // If clicked on a network that we are already connected to or we are
+      // currently trying to connect to, then open config dialog.
       if (cros->cellular_connected()) {
         NetworkConfigView* view = new NetworkConfigView(cellular);
         view->set_browser_mode(host_->IsBrowserMode());
         views::Window* window = views::Window::CreateChromeWindow(
             host_->GetNativeWindow(), gfx::Rect(), view);
         window->SetIsAlwaysOnTop(true);
         window->Show();
+      } else {
+        // TODO(stevenjb): Connection in progress. Show dialog?
       }
     } else {
       cros->ConnectToCellularNetwork(cellular);
     }
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, AnimationDelegate implementation:
 
@@ skipping 245 matching lines @@
 
   // Ethernet
   string16 label = l10n_util::GetStringUTF16(
                        IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
   SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_WIRED_BLACK);
   SkBitmap badge = cros->ethernet_connecting() || cros->ethernet_connected() ?
       SkBitmap() : *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED);
   int flag = (cros->ethernet_connecting() || cros->ethernet_connected()) ?
       FLAG_ETHERNET | FLAG_ASSOCIATED : FLAG_ETHERNET;
   menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
-      IconForDisplay(icon, badge), WifiNetwork(), CellularNetwork(), flag));
+      IconForDisplay(icon, badge), std::string(), flag));
 
   // Wifi
   const WifiNetworkVector& wifi_networks = cros->wifi_networks();
   // Wifi networks ssids.
   for (size_t i = 0; i < wifi_networks.size(); ++i) {
     label = ASCIIToUTF16(wifi_networks[i].name());
     SkBitmap icon = IconForNetworkStrength(wifi_networks[i].strength(), true);
     SkBitmap badge = wifi_networks[i].encrypted() ?
         *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE) : SkBitmap();
     flag = (wifi_networks[i].name() == cros->wifi_name()) ?
         FLAG_WIFI | FLAG_ASSOCIATED : FLAG_WIFI;
     menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
-        IconForDisplay(icon, badge), wifi_networks[i], CellularNetwork(),
-        flag));
+        IconForDisplay(icon, badge), wifi_networks[i].service_path(), flag));
   }
 
   // Cellular
   const CellularNetworkVector& cell_networks = cros->cellular_networks();
   // Cellular networks ssids.
   for (size_t i = 0; i < cell_networks.size(); ++i) {
     label = ASCIIToUTF16(cell_networks[i].name());
     SkBitmap icon = IconForNetworkStrength(cell_networks[i].strength(), true);
     // TODO(chocobo): Check cellular network 3g/edge.
     SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_3G);
 //    SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_EDGE);
     flag = (cell_networks[i].name() == cros->cellular_name()) ?
         FLAG_CELLULAR | FLAG_ASSOCIATED : FLAG_CELLULAR;
     menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
-        IconForDisplay(icon, badge), WifiNetwork(), cell_networks[i], flag));
+        IconForDisplay(icon, badge), cell_networks[i].service_path(), flag));
   }
 
   // No networks available message.
   if (wifi_networks.empty() && cell_networks.empty()) {
     label = l10n_util::GetStringFUTF16(IDS_STATUSBAR_NETWORK_MENU_ITEM_INDENT,
                 l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_NETWORKS_MESSAGE));
     menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
-        SkBitmap(), WifiNetwork(), CellularNetwork(), FLAG_DISABLED));
+        SkBitmap(), std::string(), FLAG_DISABLED));
   }
 
   // Other networks
   menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND,
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OTHER_NETWORKS),
       IconForDisplay(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0),
                      SkBitmap()),
-      WifiNetwork(), CellularNetwork(), FLAG_OTHER_NETWORK));
+      std::string(), FLAG_OTHER_NETWORK));
 
   if (cros->wifi_available() || cros->cellular_available()) {
     // Separator.
     menu_items_.push_back(MenuItem());
 
     // Turn Wifi Off. (only if wifi available)
     if (cros->wifi_available()) {
       int id = cros->wifi_enabled() ? IDS_STATUSBAR_NETWORK_DEVICE_DISABLE :
                                       IDS_STATUSBAR_NETWORK_DEVICE_ENABLE;
       label = l10n_util::GetStringFUTF16(id,
           l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_WIFI));
       menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
-          SkBitmap(), WifiNetwork(), CellularNetwork(), FLAG_TOGGLE_WIFI));
+          SkBitmap(), std::string(), FLAG_TOGGLE_WIFI));
     }
 
     // Turn Cellular Off. (only if cellular available)
     if (cros->cellular_available()) {
       int id = cros->cellular_enabled() ? IDS_STATUSBAR_NETWORK_DEVICE_DISABLE :
                                       IDS_STATUSBAR_NETWORK_DEVICE_ENABLE;
       label = l10n_util::GetStringFUTF16(id,
           l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_CELLULAR));
       menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
-          SkBitmap(), WifiNetwork(), CellularNetwork(), FLAG_TOGGLE_CELLULAR));
+          SkBitmap(), std::string(), FLAG_TOGGLE_CELLULAR));
     }
   }
 
   // TODO(chocobo): Uncomment once we figure out how to do offline mode.
   // Offline mode.
 //  menu_items_.push_back(MenuItem(cros->offline_mode() ?
 //      menus::MenuModel::TYPE_CHECK : menus::MenuModel::TYPE_COMMAND,
 //      l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OFFLINE_MODE),
-//      SkBitmap(), WifiNetwork(), CellularNetwork(), FLAG_TOGGLE_OFFLINE));
+//      SkBitmap(), std::string(), FLAG_TOGGLE_OFFLINE));
 
   if (cros->Connected() || host_->ShouldOpenButtonOptions(this)) {
     // Separator.
     menu_items_.push_back(MenuItem());
 
     // IP address
     if (cros->Connected()) {
       menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND,
           ASCIIToUTF16(cros->IPAddress()), SkBitmap(),
-          WifiNetwork(), CellularNetwork(), FLAG_DISABLED));
+          std::string(), FLAG_DISABLED));
     }
 
     // Network settings.
     if (host_->ShouldOpenButtonOptions(this)) {
       label =
           l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG);
       menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
-          SkBitmap(), WifiNetwork(), CellularNetwork(), FLAG_OPTIONS));
+          SkBitmap(), std::string(), FLAG_OPTIONS));
     }
   }
 }
 
 }  // namespace chromeos