Use signal strength of detected networks when displaying remembered networks.

chrome/browser/chromeos/dom_ui/internet_options_handler.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/dom_ui/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <string>
 #include <vector>
@@ skipping 986 matching lines @@
 }
 
 ListValue* InternetOptionsHandler::GetRememberedList() {
   chromeos::NetworkLibrary* cros =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   ListValue* list = new ListValue();
 
   const chromeos::WifiNetworkVector& wifi_networks =
       cros->remembered_wifi_networks();
+  const chromeos::WifiNetworkVector& live_wifi_networks =
+      cros->wifi_networks();

[stevenjb, 2011/01/21 17:11:18]

Since we don't use "live_wifi_networks" elsewhere I would suggest renaming
wifi_networks -> remembered_wifi_networks and live_wifi_networks ->
wifi_networks.

+
   for (chromeos::WifiNetworkVector::const_iterator it =
       wifi_networks.begin(); it != wifi_networks.end(); ++it) {

[Charlie Lee, 2011/01/21 19:21:09]

I would recommend instead of doing this in a double for loop O(nm), do it using
a hashmap O(n+m). So go through the "live" wifi networks and put each network in
the hashmap keyed by ssid+encryption. Then go through the remembered wifi
networks, and look for it in the hashmap. This will make it much more efficient
when there's a lot of wifi and remembered networks.

-    SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0_BLACK);
+    // The remembered networks from libcros/flimflam don't include the signal
+    // strength.  So, if this remembered network has the same name (SSID) as a
+    // live one, use the live one's signal strength.
+    chromeos::WifiNetworkVector::const_iterator lit =
+        live_wifi_networks.begin();
+    for ( ; lit != live_wifi_networks.end(); ++lit) {
+      if ((*it)->name() == (*lit)->name())
+        break;

[stevenjb, 2011/01/21 17:11:18]

Need to compare both name() and encryption(). We should probably have a
WifiNetwork method to do the comparison.

+    }
+    // Don't show active network in the remembered list.
+    if (lit != live_wifi_networks.end() && (*lit)->connected())
+      continue;
+    SkBitmap icon;
+    if (lit == live_wifi_networks.end())
+      icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0_BLACK);
+    else
+      icon = chromeos::NetworkMenu::IconForNetworkStrength(*lit, true);
     if ((*it)->encrypted()) {
       icon = chromeos::NetworkMenu::IconForDisplay(icon,
           *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE));

[stevenjb, 2011/01/21 17:11:18]

Does the secure icon trump the signal strength icon? Either way, the if
(encrypted) clause should be part of the if statement above. i.e. if (encrypted)
... else if (!found) ... else ...

[Charlie Lee, 2011/01/21 19:21:09]

Isn't the secure icon just a badge? If so, then we should set the icon to that.

On 2011/01/21 17:11:18, Steven Bennetts wrote:

     }
     list->Append(GetNetwork(
         (*it)->service_path(),
         icon,
         (*it)->name(),
         (*it)->connecting(),
         (*it)->connected(),
         true,
         chromeos::TYPE_WIFI,
         true,
         chromeos::ACTIVATION_STATE_UNKNOWN,
         false));
   }
   return list;
 }
 
 void InternetOptionsHandler::FillNetworkInfo(
     DictionaryValue* dictionary, chromeos::NetworkLibrary* cros) {
   dictionary->Set("wiredList", GetWiredList());
   dictionary->Set("wirelessList", GetWirelessList());
   dictionary->Set("rememberedList", GetRememberedList());
   dictionary->SetBoolean("wifiAvailable", cros->wifi_available());
   dictionary->SetBoolean("wifiEnabled", cros->wifi_enabled());
   dictionary->SetBoolean("cellularAvailable", cros->cellular_available());
   dictionary->SetBoolean("cellularEnabled", cros->cellular_enabled());
 }