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

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 <algorithm>
 #include <limits>
 
 #include "app/l10n_util.h"
@@ skipping 80 matching lines @@
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (CrosLibrary::Get()->EnsureLoaded()) {
     if (cros->wifi_connecting() || cros->cellular_connecting()) {
       // Start the connecting animation if not running.
       if (!animation_connecting_.is_animating()) {
         animation_connecting_.Reset();
         animation_connecting_.StartThrobbing(std::numeric_limits<int>::max());
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS1));
       }
       std::string network_name = cros->wifi_connecting() ?
-          cros->wifi_name() : cros->cellular_name();
+          cros->wifi_network().name() : cros->cellular_network().name();
       SetTooltipText(
           l10n_util::GetStringF(IDS_STATUSBAR_NETWORK_CONNECTING_TOOLTIP,
                                 UTF8ToWide(network_name)));
     } else {
       // Stop connecting animation since we are not connecting.
       animation_connecting_.Stop();
 
       // Always show the higher priority connection first. Ethernet then wifi.
       if (cros->ethernet_connected()) {
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_WIRED));
         SetTooltipText(
             l10n_util::GetStringF(
                 IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
                 l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET)));
       } else if (cros->wifi_connected()) {
-        SetIcon(IconForNetworkStrength(cros->wifi_strength(), false));
+        SetIcon(IconForNetworkStrength(
+            cros->wifi_network().strength(), false));
         SetTooltipText(l10n_util::GetStringF(
             IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
-            UTF8ToWide(cros->wifi_name())));
+            UTF8ToWide(cros->wifi_network().name())));
       } else if (cros->cellular_connected()) {
-        SetIcon(IconForNetworkStrength(cros->cellular_strength(), false));
+        SetIcon(IconForNetworkStrength(
+            cros->cellular_network().strength(), false));
         SetTooltipText(l10n_util::GetStringF(
             IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
-            UTF8ToWide(cros->cellular_name())));
+            UTF8ToWide(cros->cellular_network().name())));
       } else {
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0));
         SetTooltipText(l10n_util::GetString(
             IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP));
       }
     }
 
     if (!cros->Connected() && !cros->Connecting()) {
       SetBadge(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED));
     } else if (!cros->ethernet_connected() && !cros->wifi_connected() &&
@@ skipping 32 matching lines @@
 
 void NetworkMenuButton::OpenButtonOptions() const {
   host_->OpenButtonOptions(this);
 }
 
 bool NetworkMenuButton::ShouldOpenButtonOptions() const {
   return host_->ShouldOpenButtonOptions(this);
 }
 
 }  // namespace chromeos