Revert 63135 - Update icons to show lowdata and very lowdata for 3G data....

chrome/browser/chromeos/network_message_observer.cc

 // Copyright (c) 2010 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/network_message_observer.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 125 matching lines @@
     notification_connection_error_.Show(l10n_util::GetStringFUTF16(
         IDS_NETWORK_CONNECTION_ERROR_MESSAGE,
         ASCIIToUTF16(new_failed_network)), false, false);
   }
 
   // Show login box if necessary.
   if (view && initialized_)
     CreateModalPopup(view);
 }
 
-void NetworkMessageObserver::CellularDataPlanChanged(NetworkLibrary* obj) {
-  const CellularNetwork& cellular = obj->cellular_network();
+void NetworkMessageObserver::CellularDataPlanChanged(
+    const std::string& service_path, const CellularDataPlanList& plans) {
   // Active plan is the first one in the list. Use empty one if none found.
-  const CellularDataPlanList& plans = cellular.GetDataPlans();
   CellularDataPlan plan = plans.empty() ? CellularDataPlan() : plans[0];
   // If connected cellular network changed, or data plan is different, then
   // it's a new network. Then hide all previous notifications.
   bool new_plan = false;
-  if (cellular.service_path() != cellular_service_path_) {
-    cellular_service_path_ = cellular.service_path();
+  if (service_path != cellular_service_path_) {
+    cellular_service_path_ = service_path;
     new_plan = true;
   } else if (plan.plan_name != cellular_data_plan_.plan_name ||
       plan.plan_type != cellular_data_plan_.plan_type) {
     new_plan = true;
   }
   if (new_plan) {
     // New network, so hide the notifications and set the notifications title.
     notification_low_data_.Hide();
     notification_no_data_.Hide();
     if (plan.plan_type == CELLULAR_DATA_PLAN_UNLIMITED) {
       notification_no_data_.set_title(
           l10n_util::GetStringFUTF16(IDS_NETWORK_DATA_EXPIRED_TITLE,
                                      ASCIIToUTF16(plan.plan_name)));
       notification_low_data_.set_title(
           l10n_util::GetStringFUTF16(IDS_NETWORK_NEARING_EXPIRATION_TITLE,
                                      ASCIIToUTF16(plan.plan_name)));
     } else {
       notification_no_data_.set_title(
           l10n_util::GetStringFUTF16(IDS_NETWORK_OUT_OF_DATA_TITLE,
                                      ASCIIToUTF16(plan.plan_name)));
       notification_low_data_.set_title(
           l10n_util::GetStringFUTF16(IDS_NETWORK_LOW_DATA_TITLE,
                                      ASCIIToUTF16(plan.plan_name)));
     }
   }
 
-  if (plan.plan_type != CELLULAR_DATA_PLAN_UNKNOWN) {
-    if (cellular.data_left() == CellularNetwork::DATA_NONE) {
+  if (plan.plan_type == CELLULAR_DATA_PLAN_UNLIMITED) {
+    // Time based plan. Show nearing expiration and data expiration.
+    int64 time_left = plan.plan_end_time - plan.update_time;
+    if (time_left <= 0) {
       notification_low_data_.Hide();
-      int message = plan.plan_type == CELLULAR_DATA_PLAN_UNLIMITED ?
-          IDS_NETWORK_MINUTES_REMAINING_MESSAGE :
-          IDS_NETWORK_DATA_REMAINING_MESSAGE;
       notification_no_data_.Show(l10n_util::GetStringFUTF16(
-          message, ASCIIToUTF16("0")),
+          IDS_NETWORK_MINUTES_REMAINING_MESSAGE, ASCIIToUTF16("0")),
           l10n_util::GetStringUTF16(IDS_NETWORK_PURCHASE_MORE_MESSAGE),
           NewCallback(this, &NetworkMessageObserver::MobileSetup),
           false, false);
-    } else if (cellular.data_left() == CellularNetwork::DATA_VERY_LOW) {
+    } else if (time_left <= kDataNearingExpirationSecs) {
       notification_no_data_.Hide();
-      int message = plan.plan_type == CELLULAR_DATA_PLAN_UNLIMITED ?
-          IDS_NETWORK_MINUTES_REMAINING_MESSAGE :
-          IDS_NETWORK_DATA_REMAINING_MESSAGE;
-      int64 remaining = plan.plan_type == CELLULAR_DATA_PLAN_UNLIMITED ?
-          (plan.plan_end_time - plan.update_time) / 60 :
-          (plan.plan_data_bytes - plan.data_bytes_used) / (1024 * 1024);
       notification_low_data_.Show(l10n_util::GetStringFUTF16(
-          message, UTF8ToUTF16(base::Int64ToString(remaining))),
+          IDS_NETWORK_MINUTES_UNTIL_EXPIRATION_MESSAGE,
+          UTF8ToUTF16(base::Int64ToString(time_left/60))),
           l10n_util::GetStringUTF16(IDS_NETWORK_PURCHASE_MORE_MESSAGE),
           NewCallback(this, &NetworkMessageObserver::MobileSetup),
           false, false);
     } else {
-      // Got data, so hide notifications.
+      // Got more data, so hide notifications.
+      notification_low_data_.Hide();
+      notification_no_data_.Hide();
+    }
+  } else if (plan.plan_type == CELLULAR_DATA_PLAN_METERED_PAID ||
+      plan.plan_type == CELLULAR_DATA_PLAN_METERED_BASE) {
+    // Metered plan. Show low data and out of data.
+    int64 bytes_remaining = plan.plan_data_bytes - plan.data_bytes_used;
+    if (bytes_remaining <= 0) {
+      notification_low_data_.Hide();
+      notification_no_data_.Show(l10n_util::GetStringFUTF16(
+          IDS_NETWORK_DATA_REMAINING_MESSAGE, ASCIIToUTF16("0")),
+          l10n_util::GetStringUTF16(IDS_NETWORK_PURCHASE_MORE_MESSAGE),
+          NewCallback(this, &NetworkMessageObserver::MobileSetup),
+          false, false);
+    } else if (bytes_remaining <= kDataLowDataBytes) {
+      notification_no_data_.Hide();
+      notification_low_data_.Show(l10n_util::GetStringFUTF16(
+          IDS_NETWORK_DATA_REMAINING_MESSAGE,
+          UTF8ToUTF16(base::Int64ToString(bytes_remaining/1024))),
+          l10n_util::GetStringUTF16(IDS_NETWORK_PURCHASE_MORE_MESSAGE),
+          NewCallback(this, &NetworkMessageObserver::MobileSetup),
+          false, false);
+    } else {
+      // Got more data, so hide notifications.
       notification_low_data_.Hide();
       notification_no_data_.Hide();
     }
   }
 
   cellular_data_plan_ = plan;
 }
 
 }  // namespace chromeos