Cache network connecting bitmaps.

chrome/browser/chromeos/status/network_menu.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 96 matching lines @@
   virtual ui::MenuModel* GetSubmenuModelAt(int index) const { return NULL; }
   virtual void HighlightChangedTo(int index) {}
   virtual void ActivatedAt(int index);
   virtual void MenuWillShow() {}
 
   void SetFirstLevelMenuWidth(int width);
 
   // Cancels the active menu.
   void CancelMenu();
 
+  // The following methods returns pointer to a shared instance of the SkBitmap.
+  // This shared bitmap is owned by the resource bundle and should not be freed.
+
   // Returns the Icon for a network strength for a WifiNetwork |wifi|.
   // |black| is used to specify whether to return a black icon for display
   // on a light background or a white icon for display on a dark background.
-  static SkBitmap IconForNetworkStrength(const WifiNetwork* wifi, bool black);
+  static SkBitmap* IconForNetworkStrength(const WifiNetwork* wifi, bool black);
   // Returns the Icon for a network strength for CellularNetwork |cellular|.
   // |black| is used to specify whether to return a black icon for display
   // on a light background or a white icon for display on a dark background.
-  static SkBitmap IconForNetworkStrength(const CellularNetwork* cellular,
-                                         bool black);
+  static SkBitmap* IconForNetworkStrength(const CellularNetwork* cellular,
+                                          bool black);
   // Returns the Icon for animating network connecting.
   // |animation_value| is the value from Animation.GetCurrentValue()
   // |black| is used to specify whether to return a black icon for display
   // on a light background or a white icon for display on a dark background.
-  static SkBitmap IconForNetworkConnecting(double animation_value, bool black);
+  static SkBitmap* IconForNetworkConnecting(double animation_value, bool black);
   // Returns the Badge for a given network technology.
   // This returns different colored symbols depending on cellular data left.
-  static SkBitmap BadgeForNetworkTechnology(const CellularNetwork* cellular);
+  // Returns NULL if not badge is needed.
+  static SkBitmap* BadgeForNetworkTechnology(const CellularNetwork* cellular);
   // This method will convert the |icon| bitmap to the correct size for display.
-  // If the |badge| icon is not empty, it will draw that on top of the icon.
-  static SkBitmap IconForDisplay(SkBitmap icon, SkBitmap badge);
+  // If the |badge| icon is not NULL, it will draw that on top of the icon.
+  static SkBitmap IconForDisplay(SkBitmap* icon, SkBitmap* badge);
 
  protected:
   virtual bool IsBrowserMode() const = 0;
   virtual gfx::NativeWindow GetNativeWindow() const = 0;
   virtual void OpenButtonOptions() = 0;
   virtual bool ShouldOpenButtonOptions() const = 0;
 
   // Notify subclasses that connection to |network| was initiated.
   virtual void OnConnectNetwork(const Network* network,
                                 SkBitmap selected_icon_) {}
@@ skipping 57 matching lines @@
   // The number of bars images for representing network strength.
   static const int kNumBarsImages;
 
   // Bars image resources.
   static const int kBarsImages[];
   static const int kBarsImagesBlack[];
   // TODO(chocobo): Add these back when we decide to do colored bars again.
 //  static const int kBarsImagesLowData[];
 //  static const int kBarsImagesVLowData[];
 
+  // The number of animating images for network connecting.
+  static const int kNumAnimatingImages;
+  // Animation images. These are created lazily.
+  static SkBitmap* kAnimatingImages;
+  static SkBitmap* kAnimatingImagesBlack;
+
   // Our menu items.
   MenuItemVector menu_items_;
 
   // The network menu.
   scoped_ptr<views::Menu2> network_menu_;
 
   // Holds minimum width or -1 if it wasn't set up.
   int min_width_;
 
   // If true, call into the settings UI for network configuration dialogs.
   bool use_settings_ui_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkMenu);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_