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

Unified Diff: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

Issue 7778043: [cros] Support global carrier config. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 9 years, 3 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/ui/webui/options/chromeos/internet_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index 3b4ffa5c1981fd9e0a48f1eeec36ca26e129b8a7..0a480233faded3458bd9bc92451e0f6470e63236 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -25,8 +25,8 @@
#include "chrome/browser/chromeos/choose_mobile_network_dialog.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros_settings.h"
-#include "chrome/browser/chromeos/customization_document.h"
#include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/mobile_config.h"
#include "chrome/browser/chromeos/options/network_config_view.h"
#include "chrome/browser/chromeos/sim_dialog_delegate.h"
#include "chrome/browser/chromeos/status/network_menu_icon.h"
@@ -871,14 +871,13 @@ void InternetOptionsHandler::PopulateCellularDetails(
dictionary->SetBoolean("simCardLockEnabled",
device->sim_pin_required() == chromeos::SIM_PIN_REQUIRED);
- chromeos::ServicesCustomizationDocument* customization =
- chromeos::ServicesCustomizationDocument::GetInstance();
- if (customization->IsReady()) {
+ chromeos::MobileConfig* config = chromeos::MobileConfig::GetInstance();
+ if (config->IsReady()) {
std::string carrier_id = cros_->GetCellularHomeCarrierId();
- const chromeos::ServicesCustomizationDocument::CarrierDeal* deal =
- customization->GetCarrierDeal(carrier_id, false);
- if (deal && !deal->top_up_url().empty())
- dictionary->SetString("carrierUrl", deal->top_up_url());
+ const chromeos::MobileConfig::Carrier* carrier =
+ config->GetCarrier(carrier_id);
+ if (carrier && !carrier->top_up_url().empty())
+ dictionary->SetString("carrierUrl", carrier->top_up_url());
}
const chromeos::CellularApnList& apn_list = device->provider_apn_list();

Powered by Google App Engine
This is Rietveld 408576698