Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(593)

Unified Diff: chrome/browser/chromeos/status/network_menu_icon.cc

Issue 7745018: Always enable roaming for cellular operators that don't work without it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments resolved Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/status/network_menu_icon.cc
diff --git a/chrome/browser/chromeos/status/network_menu_icon.cc b/chrome/browser/chromeos/status/network_menu_icon.cc
index ea3699b7dcce7ee1987f55a100580b3a2484bc22..967754cd6fb04b9dfeb105b4d399b37361231fef 100644
--- a/chrome/browser/chromeos/status/network_menu_icon.cc
+++ b/chrome/browser/chromeos/status/network_menu_icon.cc
@@ -291,6 +291,8 @@ class NetworkIcon {
// 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: {
@@ -310,8 +312,11 @@ class NetworkIcon {
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;
« no previous file with comments | « chrome/browser/chromeos/cros/network_library.cc ('k') | chrome/browser/chromeos/user_cros_settings_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698