chromium-os:5494 Networks with identical names not handled properly.

chrome/browser/chromeos/status/network_menu.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.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/stringprintf.h"
@@ skipping 54 matching lines @@
       info->ip_address = cros->ethernet_network().ip_address();
     }
     info->need_passphrase = false;
     info->remembered = true;
   } else if (flags & FLAG_WIFI) {
     WifiNetwork wifi;
     bool found = cros->FindWifiNetworkByPath(
         menu_items_[index].wireless_path, &wifi);
     if (found) {
       info->network_type = kNetworkTypeWifi;
-      if (wifi.name() == cros->wifi_name()) {
+      if (wifi.service_path() == cros->wifi_network().service_path()) {
         if (cros->wifi_connected()) {
           info->status = kNetworkStatusConnected;
           info->message = l10n_util::GetStringUTF8(
               IDS_STATUSBAR_NETWORK_DEVICE_CONNECTED);
         } else if (cros->wifi_connecting()) {
           info->status = kNetworkStatusConnecting;
           // TODO(stevenjb): Eliminate status message, or localize properly.
           info->message = l10n_util::GetStringUTF8(
               IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING)
               + ": " + wifi.GetStateString();
@@ skipping 24 matching lines @@
       info->remembered = wifi.favorite();
     } else {
       res = false;  // Network not found, hide entry.
     }
   } else if (flags & FLAG_CELLULAR) {
     CellularNetwork cellular;
     bool found = cros->FindCellularNetworkByPath(
         menu_items_[index].wireless_path, &cellular);
     if (found) {
       info->network_type = kNetworkTypeCellular;
-      if (cellular.name() == cros->cellular_name()) {
+      if (cellular.service_path() ==
+          cros->cellular_network().service_path()) {
         if (cros->cellular_connected()) {
           info->status = kNetworkStatusConnected;
           info->message = l10n_util::GetStringUTF8(
               IDS_STATUSBAR_NETWORK_DEVICE_CONNECTED);
         } else if (cros->cellular_connecting()) {
           // TODO(stevenjb): Eliminate status message, or localize properly.
           info->status = kNetworkStatusConnecting;
           info->message = l10n_util::GetStringUTF8(
               IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING)
               + ": " + cellular.GetStateString();
@@ skipping 137 matching lines @@
       ShowEthernet(cros->ethernet_network());
     }
   } else if (flags & FLAG_WIFI) {
     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()) {
+    } else if (wifi.service_path() == cros->wifi_network().service_path()) {
       // Show the config settings for the active network.
       ShowWifi(wifi, false);
     } else {
       ConnectToNetworkAt(index, std::string(), std::string(), -1);
     }
   } else if (flags & FLAG_CELLULAR) {
     CellularNetwork cellular;
     bool cellular_exists = cros->FindCellularNetworkByPath(
         menu_items_[index].wireless_path, &cellular);
     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()) {
+    } else if (cellular.service_path() ==
+               cros->cellular_network().service_path()) {
       // Show the config settings for the cellular network.
       ShowCellular(cellular, false);
     } else {
       ConnectToNetworkAt(index, std::string(), std::string(), -1);
     }
   }
 }
 
 void NetworkMenu::SetFirstLevelMenuWidth(int width) {
   min_width_ = width;
@@ skipping 95 matching lines @@
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   // Ethernet
   bool ethernet_connected = cros->ethernet_connected();
   bool ethernet_connecting = cros->ethernet_connecting();
   string16 label = l10n_util::GetStringUTF16(
                        IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
   SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_WIRED_BLACK);
   SkBitmap badge = ethernet_connecting || ethernet_connected ?
       SkBitmap() : *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED);
-  int flag = (ethernet_connecting || ethernet_connected) ?
-      FLAG_ETHERNET | FLAG_ASSOCIATED : FLAG_ETHERNET;
+  int flag = FLAG_ETHERNET;
+  if (ethernet_connecting || ethernet_connected)
+    flag |= FLAG_ASSOCIATED;
   menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
       IconForDisplay(icon, badge), std::string(), flag));
 
   // Wifi
   const WifiNetworkVector& wifi_networks = cros->wifi_networks();
-  const std::string& active_wifi_name = cros->wifi_name();
+  const WifiNetwork& active_wifi = cros->wifi_network();
   // 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() == active_wifi_name) ?
-        FLAG_WIFI | FLAG_ASSOCIATED : FLAG_WIFI;
+    flag = FLAG_WIFI;
+    if (wifi_networks[i].service_path() == active_wifi.service_path())
+      flag |= FLAG_ASSOCIATED;
     menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
         IconForDisplay(icon, badge), wifi_networks[i].service_path(), flag));
   }
 
   // Cellular
   const CellularNetworkVector& cell_networks = cros->cellular_networks();
-  const std::string& active_cellular_name = cros->cellular_name();
+  const CellularNetwork& active_cellular = cros->cellular_network();
   // 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() == active_cellular_name) ?
-        FLAG_CELLULAR | FLAG_ASSOCIATED : FLAG_CELLULAR;
+    flag = FLAG_CELLULAR;
+    if (cell_networks[i].service_path() == active_cellular.service_path())
+      flag |= FLAG_ASSOCIATED;
     menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
         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(), std::string(), FLAG_DISABLED));
@@ skipping 116 matching lines @@
                                       chromeos::TYPE_WIFI);
       browser->ShowOptionsTab(page);
     }
   } else {
     const bool kFocusLogin = true;
     ShowNetworkConfigView(new NetworkConfigView(), kFocusLogin);
   }
 }
 
 }  // namespace chromeos