[cros] Support global carrier config.

chrome/browser/chromeos/status/network_menu_button.cc

Index: chrome/browser/chromeos/status/network_menu_button.cc
diff --git a/chrome/browser/chromeos/status/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc
index 5d34934888a8c83e6cbafe33186964dabf4110ad..e0ac5f4f9a054d2d8b4be61a7c6f91cc79b60505 100644
--- a/chrome/browser/chromeos/status/network_menu_button.cc
+++ b/chrome/browser/chromeos/status/network_menu_button.cc
@@ -277,8 +277,7 @@ void NetworkMenuButton::OnLinkActivated(size_t index) {
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, private methods:
 
-const ServicesCustomizationDocument::CarrierDeal*
-NetworkMenuButton::GetCarrierDeal(
+const MobileConfig::Carrier* NetworkMenuButton::GetCarrier(
     NetworkLibrary* cros) {
   std::string carrier_id = cros->GetCellularHomeCarrierId();
   if (carrier_id.empty()) {
@@ -286,13 +285,16 @@ NetworkMenuButton::GetCarrierDeal(
     return NULL;
   }
 
-  ServicesCustomizationDocument* customization =
-      ServicesCustomizationDocument::GetInstance();
-  if (!customization->IsReady())
+  MobileConfig* config = MobileConfig::GetInstance();
+  if (!config->IsReady())
     return NULL;
 
-  const ServicesCustomizationDocument::CarrierDeal* deal =
-      customization->GetCarrierDeal(carrier_id, true);
+  return config->GetCarrier(carrier_id);
+}
+
+const MobileConfig::CarrierDeal* NetworkMenuButton::GetCarrierDeal(
+    const MobileConfig::Carrier* carrier) {
+  const MobileConfig::CarrierDeal* deal = carrier->GetDefaultDeal();
   if (deal) {
     // Check deal for validity.
     int carrier_deal_promo_pref = GetCarrierDealPromoShown();
@@ -354,8 +356,8 @@ void NetworkMenuButton::ShowOptionalMobileDataPromoNotification(
       check_for_promo_ && BrowserList::GetLastActive() &&
       cros->cellular_connected() && !cros->ethernet_connected() &&
       !cros->wifi_connected()) {
-    const ServicesCustomizationDocument::CarrierDeal* deal =
-        GetCarrierDeal(cros);
+    const MobileConfig::Carrier* carrier = GetCarrier(cros);

[Dmitry Polukhin, 2011/09/05 06:33:11]

Carrier can be NULL you need to check it here.

[Nikita (slow), 2011/09/05 10:13:44]

Done.

+    const MobileConfig::CarrierDeal* deal = GetCarrierDeal(carrier);
     std::string deal_text;
     int carrier_deal_promo_pref = -1;
     if (deal) {
@@ -363,7 +365,7 @@ void NetworkMenuButton::ShowOptionalMobileDataPromoNotification(
       const std::string locale = g_browser_process->GetApplicationLocale();
       deal_text = deal->GetLocalizedString(locale, "notification_text");
       deal_info_url_ = deal->info_url();
-      deal_topup_url_ = deal->top_up_url();
+      deal_topup_url_ = carrier->top_up_url();
     } else if (!ShouldShow3gPromoNotification()) {
       check_for_promo_ = false;
       return;