Cache network connecting bitmaps.

chrome/browser/chromeos/status/network_menu_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_menu_button.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/string_util.h"
@@ skipping 13 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton
 
 // static
 const int NetworkMenuButton::kThrobDuration = 1000;
 
 NetworkMenuButton::NetworkMenuButton(StatusAreaHost* host)
     : StatusAreaButton(this),
       NetworkMenu(),
       host_(host),
+      icon_(NULL),
+      badge_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)) {
   animation_connecting_.SetThrobDuration(kThrobDuration);
   animation_connecting_.SetTweenType(ui::Tween::EASE_IN_OUT);
   OnNetworkManagerChanged(CrosLibrary::Get()->GetNetworkLibrary());
   CrosLibrary::Get()->GetNetworkLibrary()->AddNetworkManagerObserver(this);
   CrosLibrary::Get()->GetNetworkLibrary()->AddCellularDataPlanObserver(this);
 }
 
 NetworkMenuButton::~NetworkMenuButton() {
   NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
@@ skipping 55 matching lines @@
   host_->OpenButtonOptions(this);
 }
 
 bool NetworkMenuButton::ShouldOpenButtonOptions() const {
   return host_->ShouldOpenButtonOptions(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, private methods
 
-void NetworkMenuButton::SetIconAndBadge(const SkBitmap& icon,
-                                        const SkBitmap& badge) {
+void NetworkMenuButton::SetIconAndBadge(const SkBitmap* icon,
+                                        const SkBitmap* badge) {
   icon_ = icon;
   badge_ = badge;
   SetIcon(IconForDisplay(icon_, badge_));
 }
 
-void NetworkMenuButton::SetIconOnly(const SkBitmap& icon) {
+void NetworkMenuButton::SetIconOnly(const SkBitmap* icon) {
   icon_ = icon;
   SetIcon(IconForDisplay(icon_, badge_));
 }
 
-void NetworkMenuButton::SetBadgeOnly(const SkBitmap& badge) {
+void NetworkMenuButton::SetBadgeOnly(const SkBitmap* badge) {
   badge_ = badge;
   SetIcon(IconForDisplay(icon_, badge_));
 }
 
 void NetworkMenuButton::SetNetworkIcon(NetworkLibrary* cros,
                                        const Network* network) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   if (!cros || !CrosLibrary::Get()->EnsureLoaded()) {
-    SetIconAndBadge(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0),
-                    *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_WARNING));
+    SetIconAndBadge(rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0),
+                    rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_WARNING));
     SetTooltipText(UTF16ToWide(l10n_util::GetStringUTF16(
         IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP)));
     return;
   }
 
   if (!cros->Connected() && !cros->Connecting()) {
     animation_connecting_.Stop();
-    SetIconAndBadge(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0),
-                    *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED));
+    SetIconAndBadge(rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0),
+                    rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED));
     SetTooltipText(UTF16ToWide(l10n_util::GetStringUTF16(
         IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP)));
     return;
   }
 
   if (cros->wifi_connecting() || cros->cellular_connecting()) {
     // Start the connecting animation if not running.
     if (!animation_connecting_.is_animating()) {
       animation_connecting_.Reset();
       animation_connecting_.StartThrobbing(-1);
       SetIconOnly(IconForNetworkConnecting(0, false));
     }
     const WirelessNetwork* wireless = NULL;
     if (cros->wifi_connecting()) {
       wireless = cros->wifi_network();
-      SetBadgeOnly(SkBitmap());
+      SetBadgeOnly(NULL);
     } else {  // cellular_connecting
       wireless = cros->cellular_network();
       SetBadgeOnly(BadgeForNetworkTechnology(cros->cellular_network()));
     }
     SetTooltipText(UTF16ToWide(l10n_util::GetStringFUTF16(
         wireless->configuring() ? IDS_STATUSBAR_NETWORK_CONFIGURING_TOOLTIP
                                 : IDS_STATUSBAR_NETWORK_CONNECTING_TOOLTIP,
         UTF8ToUTF16(wireless->name()))));
   } else {
     // Stop connecting animation since we are not connecting.
     animation_connecting_.Stop();
     // Only set the icon, if it is an active network that changed.
     if (network && network->is_active()) {
       if (network->type() == TYPE_ETHERNET) {
-        SetIconAndBadge(*rb.GetBitmapNamed(IDR_STATUSBAR_WIRED), SkBitmap());
+        SetIconAndBadge(rb.GetBitmapNamed(IDR_STATUSBAR_WIRED), NULL);
         SetTooltipText(
             UTF16ToWide(l10n_util::GetStringFUTF16(
                 IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
                 l10n_util::GetStringUTF16(
                     IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET))));
       } else if (network->type() == TYPE_WIFI) {
         const WifiNetwork* wifi = static_cast<const WifiNetwork*>(network);
-        SetIconAndBadge(IconForNetworkStrength(wifi, false), SkBitmap());
+        SetIconAndBadge(IconForNetworkStrength(wifi, false), NULL);
         SetTooltipText(UTF16ToWide(l10n_util::GetStringFUTF16(
             IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
             UTF8ToUTF16(wifi->name()))));
       } else if (network->type() == TYPE_CELLULAR) {
         const CellularNetwork* cellular =
             static_cast<const CellularNetwork*>(network);
         SetIconAndBadge(IconForNetworkStrength(cellular, false),
                         BadgeForNetworkTechnology(cellular));
         SetTooltipText(UTF16ToWide(l10n_util::GetStringFUTF16(
             IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
@@ skipping 11 matching lines @@
       cros->RemoveNetworkObserver(active_network_, this);
     }
     if (!new_network.empty()) {
       cros->AddNetworkObserver(new_network, this);
     }
     active_network_ = new_network;
   }
 }
 
 }  // namespace chromeos