Fix bug where when the 3G data plan is unknown, we show a green 3G badge. We now show a grey 3G badge when the data plan is unknown.

BUG=chromium-os:9720
TEST=connect/disconnect from 3G. Verify that we transition to state with unknown plans (grey 3G badge).
Review URL: http://codereview.chromium.org/6370010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72371 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 10 insertions, 1 deletions

diff --git a/chrome/app/theme/statusbar_network_1x_unknown.png b/chrome/app/theme/statusbar_network_1x_unknown.png
new file mode 100644
index 0000000..d31e475
--- /dev/null
+++ b/chrome/app/theme/statusbar_network_1x_unknown.png
diff --git a/chrome/app/theme/statusbar_network_3g_unknown.png b/chrome/app/theme/statusbar_network_3g_unknown.png
new file mode 100644
index 0000000..87d22b8
--- /dev/null
+++ b/chrome/app/theme/statusbar_network_3g_unknown.png
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 34b1609..e1e97ab 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -551,9 +551,11 @@
         <include name="IDR_STATUSBAR_NETWORK_3G" file="statusbar_network_3g.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_3G_WARN" file="statusbar_network_3g_warn.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_3G_ERROR" file="statusbar_network_3g_error.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_NETWORK_3G_UNKNOWN" file="statusbar_network_3g_unknown.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_1X" file="statusbar_network_1x.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_1X_WARN" file="statusbar_network_1x_warn.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_1X_ERROR" file="statusbar_network_1x_error.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_NETWORK_1X_UNKNOWN" file="statusbar_network_1x_unknown.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_BARS0" file="statusbar_network_bars0.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_BARS0_BLACK" file="statusbar_network_bars0b.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_BARS1" file="statusbar_network_bars1.png" type="BINDATA" />
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index 6750207..f00a6c7 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -615,7 +615,7 @@ CellularNetwork::DataLeft CellularNetwork::GetDataLeft() const {
     return DATA_NONE;
   const CellularDataPlan* plan = GetSignificantDataPlan();
   if (!plan)
-    return DATA_NORMAL;
+    return DATA_UNKNOWN;
   if (plan->plan_type == CELLULAR_DATA_PLAN_UNLIMITED) {
     base::TimeDelta remaining = plan->remaining_time();
     if (remaining <= base::TimeDelta::FromSeconds(0))
diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h
index 3c9282d..12575ef7 100644
--- a/chrome/browser/chromeos/cros/network_library.h
+++ b/chrome/browser/chromeos/cros/network_library.h
@@ -218,6 +218,7 @@ typedef ScopedVector<CellularDataPlan> CellularDataPlanVector;
 class CellularNetwork : public WirelessNetwork {
  public:
   enum DataLeft {
+    DATA_UNKNOWN,
     DATA_NORMAL,
     DATA_LOW,
     DATA_VERY_LOW,
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index ac43bd4..5ab4590 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -418,6 +418,9 @@ SkBitmap NetworkMenu::BadgeForNetworkTechnology(
       case CellularNetwork::DATA_NORMAL:
         id = IDR_STATUSBAR_NETWORK_3G;
         break;
+      case CellularNetwork::DATA_UNKNOWN:
+        id = IDR_STATUSBAR_NETWORK_3G_UNKNOWN;
+        break;
     }
   } else if (cellular->network_technology() == NETWORK_TECHNOLOGY_1XRTT) {
     switch (cellular->GetDataLeft()) {
@@ -429,6 +432,9 @@ SkBitmap NetworkMenu::BadgeForNetworkTechnology(
       case CellularNetwork::DATA_NORMAL:
         id = IDR_STATUSBAR_NETWORK_1X;
         break;
+      case CellularNetwork::DATA_UNKNOWN:
+        id = IDR_STATUSBAR_NETWORK_1X_UNKNOWN;
+        break;
     }
   }
   if (id == -1)