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

chrome/browser/chromeos/dom_ui/internet_options_handler.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/dom_ui/internet_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/status/network_menu.h"
+#include "chrome/browser/chromeos/network_message_observer.h"
 #include "chrome/browser/dom_ui/dom_ui_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/time_format.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
@@ skipping 282 matching lines @@
   dictionary.Set("rememberedList", GetRememberedList());
   dictionary.SetBoolean("wifiAvailable", cros->wifi_available());
   dictionary.SetBoolean("wifiEnabled", cros->wifi_enabled());
   dictionary.SetBoolean("cellularAvailable", cros->cellular_available());
   dictionary.SetBoolean("cellularEnabled", cros->cellular_enabled());
   dom_ui_->CallJavascriptFunction(
       L"options.InternetOptions.refreshNetworkData", dictionary);
 }
 
 void InternetOptionsHandler::CellularDataPlanChanged(
-    chromeos::NetworkLibrary* obj) {
+    const std::string& service_path,
+    const chromeos::CellularDataPlanList& plans) {
   if (!dom_ui_)
     return;
-  const chromeos::CellularNetwork cellular = obj->cellular_network();
-  const chromeos::CellularDataPlanList& plans = cellular.GetDataPlans();
   DictionaryValue connection_plans;
   ListValue* plan_list = new ListValue();
   for (chromeos::CellularDataPlanList::const_iterator iter = plans.begin();
        iter != plans.end();
        ++iter) {
     plan_list->Append(CellularDataPlanToDictionary(*iter));
   }
-  connection_plans.SetString("servicePath", cellular.service_path());
+  connection_plans.SetString("servicePath", service_path);
   connection_plans.Set("plans", plan_list);
   dom_ui_->CallJavascriptFunction(
       L"options.InternetOptions.updateCellularPlans", connection_plans);
 }
 
 DictionaryValue* InternetOptionsHandler::CellularDataPlanToDictionary(
     const chromeos::CellularDataPlan& plan) {
 
   DictionaryValue* plan_dict = new DictionaryValue();
   plan_dict->SetInteger("plan_type", plan.plan_type);
@@ skipping 58 matching lines @@
 }
 
 string16 InternetOptionsHandler::GetPlanWarning(
     const chromeos::CellularDataPlan& plan) {
   if (plan.plan_type == chromeos::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) {
       return l10n_util::GetStringFUTF16(
           IDS_NETWORK_MINUTES_REMAINING_MESSAGE, ASCIIToUTF16("0"));
-    } else if (time_left <= chromeos::kCellularDataVeryLowSecs) {
+    } else if (time_left <= chromeos::kDataNearingExpirationSecs) {
       return l10n_util::GetStringFUTF16(
           IDS_NETWORK_MINUTES_UNTIL_EXPIRATION_MESSAGE,
           UTF8ToUTF16(base::Int64ToString(time_left/60)));
     }
   } else if (plan.plan_type == chromeos::CELLULAR_DATA_PLAN_METERED_PAID ||
              plan.plan_type == chromeos::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) {
       return l10n_util::GetStringFUTF16(
           IDS_NETWORK_DATA_REMAINING_MESSAGE, ASCIIToUTF16("0"));
-    } else if (bytes_remaining <= chromeos::kCellularDataVeryLowBytes) {
+    } else if (bytes_remaining <= chromeos::kDataLowDataBytes) {
       return l10n_util::GetStringFUTF16(
           IDS_NETWORK_DATA_REMAINING_MESSAGE,
-          UTF8ToUTF16(base::Int64ToString(bytes_remaining/(1024*1024))));
+          UTF8ToUTF16(base::Int64ToString(bytes_remaining/1024)));
     }
   }
   return string16();
 }
 
 void InternetOptionsHandler::SetDetailsCallback(const ListValue* args) {
 
   std::string service_path;
 
   if (!args->GetString(0, &service_path)) {
@@ skipping 498 matching lines @@
         icon,
         it->name(),
         it->connecting(),
         it->connected(),
         chromeos::TYPE_CELLULAR,
         true));
   }
 
   return list;
 }