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

chrome/browser/chromeos/status/network_dropdown_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_dropdown_button.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 67 matching lines @@
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (CrosLibrary::Get()->EnsureLoaded()) {
     // Always show the higher priority connection first. Ethernet then wifi.
     if (cros->ethernet_connected()) {
       animation_connecting_.Stop();
       SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_WIRED));
       SetText(l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET));
     } else if (cros->wifi_connected()) {
       animation_connecting_.Stop();
-      SetIcon(IconForNetworkStrength(cros->wifi_strength(), true));
-      SetText(ASCIIToWide(cros->wifi_name()));
+      SetIcon(IconForNetworkStrength(
+          cros->wifi_network().strength(), true));
+      SetText(ASCIIToWide(cros->wifi_network().name()));
     } else if (cros->cellular_connected()) {
       animation_connecting_.Stop();
-      SetIcon(IconForNetworkStrength(cros->cellular_strength(), false));
-      SetText(ASCIIToWide(cros->cellular_name()));
+      SetIcon(IconForNetworkStrength(
+          cros->cellular_network().strength(), false));
+      SetText(ASCIIToWide(cros->cellular_network().name()));
     } else if (cros->wifi_connecting() || cros->cellular_connecting()) {
       if (!animation_connecting_.is_animating()) {
         animation_connecting_.Reset();
         animation_connecting_.StartThrobbing(-1);
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS1_BLACK));
       }
 
       if (cros->wifi_connecting())
-        SetText(ASCIIToWide(cros->wifi_name()));
+        SetText(ASCIIToWide(cros->wifi_network().name()));
       else if (cros->cellular_connecting())
-        SetText(ASCIIToWide(cros->cellular_name()));
+        SetText(ASCIIToWide(cros->cellular_network().name()));
     }
 
     if (!cros->Connected() && !cros->Connecting()) {
       animation_connecting_.Stop();
       SetIcon(SkBitmap());
       SetText(l10n_util::GetString(IDS_NETWORK_SELECTION_NONE));
     }
   } else {
     animation_connecting_.Stop();
     SetIcon(SkBitmap());
     SetText(l10n_util::GetString(IDS_STATUSBAR_NO_NETWORKS_MESSAGE));
   }
 
   SchedulePaint();
 }
 
 }  // namespace chromeos