Track cellular badge in icon cache.

chrome/browser/chromeos/status/network_menu_icon.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/status/network_menu_icon.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/utf_string_conversions.h"
@@ skipping 139 matching lines @@
  public:
   // Default constructor is used by the status bar icon (NetworkMenuIcon).
   NetworkIcon()
       : state_(STATE_UNKNOWN),
         strength_index_(-1),
         top_left_badge_(NULL),
         top_right_badge_(NULL),
         bottom_left_badge_(NULL),
         bottom_right_badge_(NULL),
         is_status_bar_(true),
-        connected_network_(NULL) {
+        connected_network_(NULL),
+        roaming_state_(ROAMING_STATE_UNKNOWN) {
   }
 
   // Service path constructor for cached network service icons.
   explicit NetworkIcon(const std::string& service_path)
       : service_path_(service_path),
         state_(STATE_UNKNOWN),
         strength_index_(-1),
         top_left_badge_(NULL),
         top_right_badge_(NULL),
         bottom_left_badge_(NULL),
         bottom_right_badge_(NULL),
         is_status_bar_(false),
-        connected_network_(NULL) {
+        connected_network_(NULL),
+        roaming_state_(ROAMING_STATE_UNKNOWN) {
   }
 
   ~NetworkIcon() {
   }
 
   void ClearIconAndBadges() {
     icon_ = SkBitmap();
     top_left_badge_ = NULL;
     top_right_badge_ = NULL;
     bottom_left_badge_ = NULL;
@@ skipping 32 matching lines @@
         index = WifiStrengthIndex(
             static_cast<const WifiNetwork*>(network));
       } else if (type == TYPE_CELLULAR) {
         index = CellularStrengthIndex(
             static_cast<const CellularNetwork*>(network));
       }
       if (index != strength_index_) {
         strength_index_ = index;
         dirty = true;
       }
-    } else if (type == TYPE_VPN) {
+    }
+    if (type == TYPE_CELLULAR) {
+      const CellularNetwork* cellular =
+          static_cast<const CellularNetwork*>(network);
+      const SkBitmap* technology_badge = BadgeForNetworkTechnology(cellular);
+      if (technology_badge != bottom_right_badge_)
+        dirty = true;
+      if (cellular->roaming_state() != roaming_state_) {
+        roaming_state_ = cellular->roaming_state();
+        dirty = true;
+      }
+    }
+    if (type == TYPE_VPN) {
       if (cros->connected_network() != connected_network_) {
         connected_network_ = cros->connected_network();
         dirty = true;
       }
     }
     if (dirty) {
       UpdateIcon(network);
       GenerateBitmap();
     }
   }
@@ skipping 147 matching lines @@
   ConnectionState state_;
   int strength_index_;
   SkBitmap bitmap_;
   SkBitmap icon_;
   const SkBitmap* top_left_badge_;
   const SkBitmap* top_right_badge_;
   const SkBitmap* bottom_left_badge_;
   const SkBitmap* bottom_right_badge_;
   bool is_status_bar_;
   const Network* connected_network_;  // weak pointer; used for VPN icons.
+  NetworkRoamingState roaming_state_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkIcon);
 };
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuIcon
 
 NetworkMenuIcon::NetworkMenuIcon(Delegate* delegate, Mode mode)
     : mode_(mode),
       delegate_(delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)),
-      last_network_type_(TYPE_WIFI) {
+      last_network_type_(TYPE_WIFI),
+      connecting_network_(NULL) {
   // Generate empty images for blending.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const SkBitmap* vpn_badge = rb.GetBitmapNamed(kVpnBadgeId);
   empty_vpn_badge_.setConfig(SkBitmap::kARGB_8888_Config,
                              vpn_badge->width(), vpn_badge->height(), 0);
   empty_vpn_badge_.allocPixels();
   empty_vpn_badge_.eraseARGB(0, 0, 0, 0);
 
   // Set up the connection animation throbber.
   animation_connecting_.SetThrobDuration(kThrobDurationMs);
@@ skipping 320 matching lines @@
 
 const SkBitmap NetworkMenuIcon::GetDisconnectedBitmap(BitmapType type) {
   return GetBitmap(type, 0);
 }
 
 int NetworkMenuIcon::NumBitmaps(BitmapType type) {
   return (type == ARCS) ? kNumArcsImages : kNumBarsImages;
 }
 
 }  // chromeos