Cache network connecting bitmaps.

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 "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
@@ skipping 32 matching lines @@
 NetworkDropdownButton::~NetworkDropdownButton() {
   CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, ui::AnimationDelegate implementation:
 
 void NetworkDropdownButton::AnimationProgressed(
     const ui::Animation* animation) {
   if (animation == &animation_connecting_) {
-    SetIcon(IconForNetworkConnecting(animation_connecting_.GetCurrentValue(),
-                                     true));
+    SetIcon(*IconForNetworkConnecting(animation_connecting_.GetCurrentValue(),
+                                      true));
     SchedulePaint();
   } else {
     MenuButton::AnimationProgressed(animation);
   }
 }
 
 void NetworkDropdownButton::Refresh() {
   OnNetworkManagerChanged(CrosLibrary::Get()->GetNetworkLibrary());
 }
 
@@ skipping 14 matching lines @@
     const Network* active_network = cros->active_network();
     if (active_network != NULL) {
       animation_connecting_.Stop();
       if (active_network->type() == TYPE_ETHERNET) {
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_WIRED));
         SetText(UTF16ToWide(
             l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET)));
       } else if (active_network->type() == TYPE_WIFI) {
         const WifiNetwork* wifi =
             static_cast<const WifiNetwork*>(active_network);
-        SetIcon(IconForNetworkStrength(wifi, true));
+        SetIcon(*IconForNetworkStrength(wifi, true));
         SetText(ASCIIToWide(wifi->name()));
       } else if (active_network->type() == TYPE_CELLULAR) {
         const CellularNetwork* cellular =
             static_cast<const CellularNetwork*>(active_network);
-        SetIcon(IconForNetworkStrength(cellular, true));
+        SetIcon(*IconForNetworkStrength(cellular, true));
         SetText(ASCIIToWide(cellular->name()));
       } else {
         NOTREACHED();
       }
     } else if (cros->wifi_connecting() || cros->cellular_connecting()) {
       if (!animation_connecting_.is_animating()) {
         animation_connecting_.Reset();
         animation_connecting_.StartThrobbing(-1);
-        SetIcon(IconForNetworkConnecting(0, true));
+        SetIcon(*IconForNetworkConnecting(0, true));
       }
       if (cros->wifi_connecting())
         SetText(ASCIIToWide(cros->wifi_network()->name()));
       else if (cros->cellular_connecting())
         SetText(ASCIIToWide(cros->cellular_network()->name()));
     }
 
     if (!cros->Connected() && !cros->Connecting()) {
       animation_connecting_.Stop();
       SetIcon(SkBitmap());
       SetText(UTF16ToWide(
           l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_NONE)));
     }
   } else {
     animation_connecting_.Stop();
     SetIcon(SkBitmap());
     SetText(UTF16ToWide(
         l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_NETWORKS_MESSAGE)));
   }
 
   SchedulePaint();
   UpdateMenu();
 }
 
 }  // namespace chromeos