| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" |
| 6 | 6 |
| 7 #include <ctype.h> | 7 #include <ctype.h> |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/base64.h" | 13 #include "base/base64.h" |
| 14 #include "base/basictypes.h" | 14 #include "base/basictypes.h" |
| 15 #include "base/callback.h" | 15 #include "base/callback.h" |
| 16 #include "base/command_line.h" | 16 #include "base/command_line.h" |
| 17 #include "base/i18n/time_formatting.h" | 17 #include "base/i18n/time_formatting.h" |
| 18 #include "base/string16.h" | 18 #include "base/string16.h" |
| 19 #include "base/string_number_conversions.h" | 19 #include "base/string_number_conversions.h" |
| 20 #include "base/stringprintf.h" | 20 #include "base/stringprintf.h" |
| 21 #include "base/time.h" | 21 #include "base/time.h" |
| 22 #include "base/utf_string_conversions.h" | 22 #include "base/utf_string_conversions.h" |
| 23 #include "base/values.h" | 23 #include "base/values.h" |
| 24 #include "chrome/browser/browser_process.h" | 24 #include "chrome/browser/browser_process.h" |
| 25 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h" | 25 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h" |
| 26 #include "chrome/browser/chromeos/cros/cros_library.h" | 26 #include "chrome/browser/chromeos/cros/cros_library.h" |
| 27 #include "chrome/browser/chromeos/cros_settings.h" | 27 #include "chrome/browser/chromeos/cros_settings.h" |
| 28 #include "chrome/browser/chromeos/customization_document.h" | |
| 29 #include "chrome/browser/chromeos/login/user_manager.h" | 28 #include "chrome/browser/chromeos/login/user_manager.h" |
| 29 #include "chrome/browser/chromeos/mobile_config.h" |
| 30 #include "chrome/browser/chromeos/options/network_config_view.h" | 30 #include "chrome/browser/chromeos/options/network_config_view.h" |
| 31 #include "chrome/browser/chromeos/sim_dialog_delegate.h" | 31 #include "chrome/browser/chromeos/sim_dialog_delegate.h" |
| 32 #include "chrome/browser/chromeos/status/network_menu_icon.h" | 32 #include "chrome/browser/chromeos/status/network_menu_icon.h" |
| 33 #include "chrome/browser/chromeos/user_cros_settings_provider.h" | 33 #include "chrome/browser/chromeos/user_cros_settings_provider.h" |
| 34 #include "chrome/browser/prefs/pref_service.h" | 34 #include "chrome/browser/prefs/pref_service.h" |
| 35 #include "chrome/browser/profiles/profile.h" | 35 #include "chrome/browser/profiles/profile.h" |
| 36 #include "chrome/browser/ui/browser.h" | 36 #include "chrome/browser/ui/browser.h" |
| 37 #include "chrome/browser/ui/browser_list.h" | 37 #include "chrome/browser/ui/browser_list.h" |
| 38 #include "chrome/browser/ui/browser_window.h" | 38 #include "chrome/browser/ui/browser_window.h" |
| 39 #include "chrome/browser/ui/views/window.h" | 39 #include "chrome/browser/ui/views/window.h" |
| (...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 864 dictionary->SetString("imei", device->imei()); | 864 dictionary->SetString("imei", device->imei()); |
| 865 dictionary->SetString("mdn", device->mdn()); | 865 dictionary->SetString("mdn", device->mdn()); |
| 866 dictionary->SetString("imsi", device->imsi()); | 866 dictionary->SetString("imsi", device->imsi()); |
| 867 dictionary->SetString("esn", device->esn()); | 867 dictionary->SetString("esn", device->esn()); |
| 868 dictionary->SetString("min", device->min()); | 868 dictionary->SetString("min", device->min()); |
| 869 dictionary->SetBoolean("gsm", | 869 dictionary->SetBoolean("gsm", |
| 870 device->technology_family() == chromeos::TECHNOLOGY_FAMILY_GSM); | 870 device->technology_family() == chromeos::TECHNOLOGY_FAMILY_GSM); |
| 871 dictionary->SetBoolean("simCardLockEnabled", | 871 dictionary->SetBoolean("simCardLockEnabled", |
| 872 device->sim_pin_required() == chromeos::SIM_PIN_REQUIRED); | 872 device->sim_pin_required() == chromeos::SIM_PIN_REQUIRED); |
| 873 | 873 |
| 874 chromeos::ServicesCustomizationDocument* customization = | 874 chromeos::MobileConfig* config = chromeos::MobileConfig::GetInstance(); |
| 875 chromeos::ServicesCustomizationDocument::GetInstance(); | 875 if (config->IsReady()) { |
| 876 if (customization->IsReady()) { | |
| 877 std::string carrier_id = cros_->GetCellularHomeCarrierId(); | 876 std::string carrier_id = cros_->GetCellularHomeCarrierId(); |
| 878 const chromeos::ServicesCustomizationDocument::CarrierDeal* deal = | 877 const chromeos::MobileConfig::Carrier* carrier = |
| 879 customization->GetCarrierDeal(carrier_id, false); | 878 config->GetCarrier(carrier_id); |
| 880 if (deal && !deal->top_up_url().empty()) | 879 if (carrier && !carrier->top_up_url().empty()) |
| 881 dictionary->SetString("carrierUrl", deal->top_up_url()); | 880 dictionary->SetString("carrierUrl", carrier->top_up_url()); |
| 882 } | 881 } |
| 883 | 882 |
| 884 const chromeos::CellularApnList& apn_list = device->provider_apn_list(); | 883 const chromeos::CellularApnList& apn_list = device->provider_apn_list(); |
| 885 ListValue* apn_list_value = new ListValue(); | 884 ListValue* apn_list_value = new ListValue(); |
| 886 for (chromeos::CellularApnList::const_iterator it = apn_list.begin(); | 885 for (chromeos::CellularApnList::const_iterator it = apn_list.begin(); |
| 887 it != apn_list.end(); ++it) { | 886 it != apn_list.end(); ++it) { |
| 888 apn_list_value->Append(CreateDictionaryFromCellularApn(*it)); | 887 apn_list_value->Append(CreateDictionaryFromCellularApn(*it)); |
| 889 } | 888 } |
| 890 dictionary->Set("providerApnList", apn_list_value); | 889 dictionary->Set("providerApnList", apn_list_value); |
| 891 } | 890 } |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1307 dictionary->SetBoolean("accessLocked", cros_->IsLocked()); | 1306 dictionary->SetBoolean("accessLocked", cros_->IsLocked()); |
| 1308 dictionary->Set("wiredList", GetWiredList()); | 1307 dictionary->Set("wiredList", GetWiredList()); |
| 1309 dictionary->Set("wirelessList", GetWirelessList()); | 1308 dictionary->Set("wirelessList", GetWirelessList()); |
| 1310 dictionary->Set("vpnList", GetVPNList()); | 1309 dictionary->Set("vpnList", GetVPNList()); |
| 1311 dictionary->Set("rememberedList", GetRememberedList()); | 1310 dictionary->Set("rememberedList", GetRememberedList()); |
| 1312 dictionary->SetBoolean("wifiAvailable", cros_->wifi_available()); | 1311 dictionary->SetBoolean("wifiAvailable", cros_->wifi_available()); |
| 1313 dictionary->SetBoolean("wifiEnabled", cros_->wifi_enabled()); | 1312 dictionary->SetBoolean("wifiEnabled", cros_->wifi_enabled()); |
| 1314 dictionary->SetBoolean("cellularAvailable", cros_->cellular_available()); | 1313 dictionary->SetBoolean("cellularAvailable", cros_->cellular_available()); |
| 1315 dictionary->SetBoolean("cellularEnabled", cros_->cellular_enabled()); | 1314 dictionary->SetBoolean("cellularEnabled", cros_->cellular_enabled()); |
| 1316 } | 1315 } |
| OLD | NEW |