Cache network icon urls

chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 294 matching lines @@
       NetworkHandler::Get()
           ->network_state_handler()
           ->GetFavoriteStateFromServicePath(network->path(),
                                             true /* configured_only */);
   if (!favorite)
     return false;
   return HasPolicyForFavorite(favorite, profile_prefs);
 }
 
 void SetCommonNetworkInfo(const ManagedState* state,
-                          const gfx::ImageSkia& icon,
-                          float icon_scale_factor,
+                          const std::string& icon_url,
                           base::DictionaryValue* network_info) {
-  gfx::ImageSkiaRep image_rep =
-      icon.GetRepresentation(icon_scale_factor);
-  std::string icon_url =
-      icon.isNull() ? "" : webui::GetBitmapDataUrl(image_rep.sk_bitmap());
   network_info->SetString(kNetworkInfoKeyIconURL, icon_url);
 
   std::string name = state->name();
   if (state->Matches(NetworkTypePattern::Ethernet())) {
     name = internet_options_strings::NetworkDeviceTypeString(
         shill::kTypeEthernet);
   }
   network_info->SetString(kNetworkInfoKeyNetworkName, name);
   network_info->SetString(kNetworkInfoKeyNetworkType, state->type());
   network_info->SetString(kNetworkInfoKeyServicePath, state->path());
 }
 
 // Builds a dictionary with network information and an icon used for the
 // NetworkList on the settings page. Ownership of the returned pointer is
 // transferred to the caller.
 base::DictionaryValue* BuildNetworkDictionary(
     const NetworkState* network,
     float icon_scale_factor,
     const PrefService* profile_prefs) {
   scoped_ptr<base::DictionaryValue> network_info(new base::DictionaryValue());
   network_info->SetBoolean(kNetworkInfoKeyConnectable, network->connectable());
   network_info->SetBoolean(kNetworkInfoKeyConnected,
                            network->IsConnectedState());
   network_info->SetBoolean(kNetworkInfoKeyConnecting,
                            network->IsConnectingState());
   network_info->SetBoolean(kNetworkInfoKeyPolicyManaged,
                            HasPolicyForNetwork(network, profile_prefs));
 
-  gfx::ImageSkia icon = ash::network_icon::GetImageForNetwork(
-      network, ash::network_icon::ICON_TYPE_LIST);
-  SetCommonNetworkInfo(network, icon, icon_scale_factor, network_info.get());
+  std::string icon_url = ash::network_icon::GetImageUrlForNetwork(
+      network, ash::network_icon::ICON_TYPE_LIST, icon_scale_factor);
+  SetCommonNetworkInfo(network, icon_url, network_info.get());
   return network_info.release();
 }
 
 base::DictionaryValue* BuildFavoriteDictionary(
     const FavoriteState* favorite,
     float icon_scale_factor,
     const PrefService* profile_prefs) {
   scoped_ptr<base::DictionaryValue> network_info(new base::DictionaryValue());
   network_info->SetBoolean(kNetworkInfoKeyConnectable, false);
   network_info->SetBoolean(kNetworkInfoKeyConnected, false);
   network_info->SetBoolean(kNetworkInfoKeyConnecting, false);
   network_info->SetBoolean(kNetworkInfoKeyPolicyManaged,
                            HasPolicyForFavorite(favorite, profile_prefs));
 
-  gfx::ImageSkia icon = ash::network_icon::GetImageForDisconnectedNetwork(
-      ash::network_icon::ICON_TYPE_LIST, favorite->type());
-  SetCommonNetworkInfo(favorite, icon, icon_scale_factor, network_info.get());
+  std::string icon_url = ash::network_icon::GetImageUrlForDisconnectedNetwork(
+      ash::network_icon::ICON_TYPE_LIST, favorite->type(), icon_scale_factor);
+  SetCommonNetworkInfo(favorite, icon_url, network_info.get());
   return network_info.release();
 }
 
 // Pulls IP information out of a shill service properties dictionary. If
 // |static_ip| is true, then it fetches "StaticIP.*" properties. If not, then it
 // fetches "SavedIP.*" properties. Caller must take ownership of returned
 // dictionary.  If non-NULL, |ip_parameters_set| returns a count of the number
 // of IP routing parameters that get set.
 base::DictionaryValue* BuildIPInfoDictionary(
     const base::DictionaryValue& shill_properties,
@@ skipping 1443 matching lines @@
   dictionary->SetBoolean(
       kTagWimaxAvailable,
       handler->IsTechnologyAvailable(NetworkTypePattern::Wimax()));
   dictionary->SetBoolean(
       kTagWimaxEnabled,
       handler->IsTechnologyEnabled(NetworkTypePattern::Wimax()));
 }
 
 }  // namespace options
 }  // namespace chromeos