Cache network connecting bitmaps.

chrome/browser/chromeos/webui/internet_options_handler.cc

 // Copyright (c) 2011 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/webui/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 915 matching lines @@
 ListValue* InternetOptionsHandler::GetWiredList() {
   chromeos::NetworkLibrary* cros =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   ListValue* list = new ListValue();
 
   // If ethernet is not enabled, then don't add anything.
   if (cros->ethernet_enabled()) {
     const chromeos::EthernetNetwork* ethernet_network =
         cros->ethernet_network();
-    SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_WIRED_BLACK);
-    if (!ethernet_network || (!ethernet_network->connecting() &&
-        !ethernet_network->connected())) {
-      icon = chromeos::NetworkMenu::IconForDisplay(icon,
-          *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED));
-    }
+    SkBitmap* icon = rb.GetBitmapNamed(IDR_STATUSBAR_WIRED_BLACK);

[stevenjb, 2011/02/28 23:02:37]

nit: const*

[Charlie Lee, 2011/02/28 23:54:13]

Done.

+    SkBitmap* badge = !ethernet_network ||

[stevenjb, 2011/02/28 23:02:37]

nit: const*

[Charlie Lee, 2011/02/28 23:54:13]

Done.

+        (!ethernet_network->connecting() && !ethernet_network->connected()) ?
+            rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED) : NULL;
     if (ethernet_network) {
       list->Append(GetNetwork(
           ethernet_network->service_path(),
-          icon,
+          chromeos::NetworkMenu::IconForDisplay(icon, badge),
           l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
           ethernet_network->connecting(),
           ethernet_network->connected(),
           ethernet_network->connectable(),
           chromeos::TYPE_ETHERNET,
           false,
           chromeos::ACTIVATION_STATE_UNKNOWN,
           false));
     }
   }
   return list;
 }
 
 ListValue* InternetOptionsHandler::GetWirelessList() {
   chromeos::NetworkLibrary* cros =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   ListValue* list = new ListValue();
 
   const chromeos::WifiNetworkVector& wifi_networks = cros->wifi_networks();
   for (chromeos::WifiNetworkVector::const_iterator it =
       wifi_networks.begin(); it != wifi_networks.end(); ++it) {
-    SkBitmap icon = chromeos::NetworkMenu::IconForNetworkStrength(*it, true);
-    if ((*it)->encrypted()) {
-      icon = chromeos::NetworkMenu::IconForDisplay(icon,
-          *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE));
-    }
+    const SkBitmap* icon =
+        chromeos::NetworkMenu::IconForNetworkStrength(*it, true);
+    const SkBitmap* badge = (*it)->encrypted() ?
+        rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE) : NULL;
     list->Append(GetNetwork(
         (*it)->service_path(),
-        icon,
+        chromeos::NetworkMenu::IconForDisplay(icon, badge),
         (*it)->name(),
         (*it)->connecting(),
         (*it)->connected(),
         (*it)->connectable(),
         chromeos::TYPE_WIFI,
         false,
         chromeos::ACTIVATION_STATE_UNKNOWN,
         false));
   }
 
   const chromeos::CellularNetworkVector cellular_networks =
       cros->cellular_networks();
   for (chromeos::CellularNetworkVector::const_iterator it =
       cellular_networks.begin(); it != cellular_networks.end(); ++it) {
-    SkBitmap icon = chromeos::NetworkMenu::IconForNetworkStrength(*it, true);
-    SkBitmap badge = chromeos::NetworkMenu::BadgeForNetworkTechnology(*it);
-    icon = chromeos::NetworkMenu::IconForDisplay(icon, badge);
+    const SkBitmap* icon =
+        chromeos::NetworkMenu::IconForNetworkStrength(*it, true);
+    const SkBitmap* badge =
+        chromeos::NetworkMenu::BadgeForNetworkTechnology(*it);
     list->Append(GetNetwork(
         (*it)->service_path(),
-        icon,
+        chromeos::NetworkMenu::IconForDisplay(icon, badge),
         (*it)->name(),
         (*it)->connecting(),
         (*it)->connected(),
         (*it)->connectable(),
         chromeos::TYPE_CELLULAR,
         false,
         (*it)->activation_state(),
         (*it)->restricted_pool()));
   }
 
@@ skipping 45 matching lines @@
        rit != remembered_wifi_networks.end(); ++rit) {
     chromeos::WifiNetwork* wifi = *rit;
     // Check if this remembered network has a matching detected network.
     std::map<std::string, chromeos::WifiNetwork*>::const_iterator it =
         wifi_map.find(GetWifiUniqueIdentifier(wifi));
     bool found = it != wifi_map.end();
 
     // Don't show the active network in the remembered list.
     if (found && (it->second)->connected())
       continue;
-    SkBitmap icon;
-    if (found)
-      icon = chromeos::NetworkMenu::IconForNetworkStrength(it->second, true);
-    else
-      icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0_BLACK);
+    const SkBitmap* icon = found ?
+        chromeos::NetworkMenu::IconForNetworkStrength(it->second, true) :
+        rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0_BLACK);
     // Place the secure badge on the icon if the remembered network is
     // encrypted (the matching detected network, if any, will have the same
     // encrypted property by definition).
-    if (wifi->encrypted()) {
-      icon = chromeos::NetworkMenu::IconForDisplay(icon,
-          *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE));
-    }
+    const SkBitmap* badge = wifi->encrypted() ?
+        rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE) : NULL;
     list->Append(GetNetwork(
         wifi->service_path(),
-        icon,
+        chromeos::NetworkMenu::IconForDisplay(icon, badge),
         wifi->name(),
         wifi->connecting(),
         wifi->connected(),
         true,
         chromeos::TYPE_WIFI,
         true,
         chromeos::ACTIVATION_STATE_UNKNOWN,
         false));
   }
   return list;
 }
 
 void InternetOptionsHandler::FillNetworkInfo(
     DictionaryValue* dictionary, chromeos::NetworkLibrary* cros) {
   dictionary->SetBoolean("accessLocked", cros->IsLocked());
   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());
 }