Always enable roaming for cellular operators that don't work without it

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 <math.h>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 273 matching lines @@
     }
   }
 
   // Sets up the various badges:
   // top_left: Cellular Roaming
   // top_right: Unused
   // bottom_left: VPN
   // bottom_right: disconnected / secure / technology / warning
   void SetBadges(const Network* network) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    chromeos::NetworkLibrary* cros =
+        chromeos::CrosLibrary::Get()->GetNetworkLibrary();
 
     switch (network->type()) {
       case TYPE_ETHERNET: {
         if (network->disconnected()) {
           bottom_right_badge_ =
               rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED);
         }
         break;
       }
       case TYPE_WIFI: {
         const WifiNetwork* wifi =
             static_cast<const WifiNetwork*>(network);
         if (wifi->encrypted() && !is_status_bar_)
           bottom_right_badge_ = rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE);
         break;
       }
       case TYPE_CELLULAR: {
         const CellularNetwork* cellular =
             static_cast<const CellularNetwork*>(network);
-        if (cellular->roaming_state() == ROAMING_STATE_ROAMING)
+        if (cellular->roaming_state() == ROAMING_STATE_ROAMING &&
+            !cros->IsCellularAlwaysInRoaming()) {
+          // For cellular that always in roaming don't show roaming badge.
           top_left_badge_ = rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_ROAMING);
+        }
         if (!cellular->connecting())
           bottom_right_badge_ = BadgeForNetworkTechnology(cellular);
         break;
       }
       default:
         break;
     }
   }
 
   // Clears any previous state then sets the base icon and badges.
@@ skipping 358 matching lines @@
         ethernet_icon->width(), ethernet_icon->height(), false);
     canvas.DrawBitmapInt(*ethernet_icon, 0, 0);
     const SkBitmap* vpn_badge = rb.GetBitmapNamed(kVpnBadgeId);
     canvas.DrawBitmapInt(*vpn_badge, kBadgeLeftX, kBadgeBottomY);
     vpn_bitmap = new SkBitmap(canvas.ExtractBitmap());
   }
   return vpn_bitmap;
 }
 
 }  // chromeos