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

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

Issue 7633055: base: Fix the TODO in string_util.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chrome_mini_installer.cc Created 9 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/i18n/time_formatting.h" 16 #include "base/i18n/time_formatting.h"
17 #include "base/string16.h" 17 #include "base/string16.h"
18 #include "base/string_number_conversions.h" 18 #include "base/string_number_conversions.h"
19 #include "base/stringprintf.h"
19 #include "base/time.h" 20 #include "base/time.h"
20 #include "base/utf_string_conversions.h" 21 #include "base/utf_string_conversions.h"
21 #include "base/values.h" 22 #include "base/values.h"
22 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
23 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h" 24 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"
24 #include "chrome/browser/chromeos/cros/cros_library.h" 25 #include "chrome/browser/chromeos/cros/cros_library.h"
25 #include "chrome/browser/chromeos/cros_settings.h" 26 #include "chrome/browser/chromeos/cros_settings.h"
26 #include "chrome/browser/chromeos/customization_document.h" 27 #include "chrome/browser/chromeos/customization_document.h"
27 #include "chrome/browser/chromeos/login/user_manager.h" 28 #include "chrome/browser/chromeos/login/user_manager.h"
28 #include "chrome/browser/chromeos/options/network_config_view.h" 29 #include "chrome/browser/chromeos/options/network_config_view.h"
(...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 814
814 // Device settings. 815 // Device settings.
815 const chromeos::NetworkDevice* device = 816 const chromeos::NetworkDevice* device =
816 cros_->FindNetworkDeviceByPath(cellular->device_path()); 817 cros_->FindNetworkDeviceByPath(cellular->device_path());
817 if (device) { 818 if (device) {
818 dictionary->SetString("manufacturer", device->manufacturer()); 819 dictionary->SetString("manufacturer", device->manufacturer());
819 dictionary->SetString("modelId", device->model_id()); 820 dictionary->SetString("modelId", device->model_id());
820 dictionary->SetString("firmwareRevision", device->firmware_revision()); 821 dictionary->SetString("firmwareRevision", device->firmware_revision());
821 dictionary->SetString("hardwareRevision", device->hardware_revision()); 822 dictionary->SetString("hardwareRevision", device->hardware_revision());
822 dictionary->SetString("prlVersion", 823 dictionary->SetString("prlVersion",
823 StringPrintf("%u", device->prl_version())); 824 base::StringPrintf("%u", device->prl_version()));
824 dictionary->SetString("meid", device->meid()); 825 dictionary->SetString("meid", device->meid());
825 dictionary->SetString("imei", device->imei()); 826 dictionary->SetString("imei", device->imei());
826 dictionary->SetString("mdn", device->mdn()); 827 dictionary->SetString("mdn", device->mdn());
827 dictionary->SetString("imsi", device->imsi()); 828 dictionary->SetString("imsi", device->imsi());
828 dictionary->SetString("esn", device->esn()); 829 dictionary->SetString("esn", device->esn());
829 dictionary->SetString("min", device->min()); 830 dictionary->SetString("min", device->min());
830 dictionary->SetBoolean("gsm", 831 dictionary->SetBoolean("gsm",
831 device->technology_family() == chromeos::TECHNOLOGY_FAMILY_GSM); 832 device->technology_family() == chromeos::TECHNOLOGY_FAMILY_GSM);
832 dictionary->SetBoolean("simCardLockEnabled", 833 dictionary->SetBoolean("simCardLockEnabled",
833 device->sim_pin_required() == chromeos::SIM_PIN_REQUIRED); 834 device->sim_pin_required() == chromeos::SIM_PIN_REQUIRED);
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
1268 dictionary->SetBoolean("accessLocked", cros_->IsLocked()); 1269 dictionary->SetBoolean("accessLocked", cros_->IsLocked());
1269 dictionary->Set("wiredList", GetWiredList()); 1270 dictionary->Set("wiredList", GetWiredList());
1270 dictionary->Set("wirelessList", GetWirelessList()); 1271 dictionary->Set("wirelessList", GetWirelessList());
1271 dictionary->Set("vpnList", GetVPNList()); 1272 dictionary->Set("vpnList", GetVPNList());
1272 dictionary->Set("rememberedList", GetRememberedList()); 1273 dictionary->Set("rememberedList", GetRememberedList());
1273 dictionary->SetBoolean("wifiAvailable", cros_->wifi_available()); 1274 dictionary->SetBoolean("wifiAvailable", cros_->wifi_available());
1274 dictionary->SetBoolean("wifiEnabled", cros_->wifi_enabled()); 1275 dictionary->SetBoolean("wifiEnabled", cros_->wifi_enabled());
1275 dictionary->SetBoolean("cellularAvailable", cros_->cellular_available()); 1276 dictionary->SetBoolean("cellularAvailable", cros_->cellular_available());
1276 dictionary->SetBoolean("cellularEnabled", cros_->cellular_enabled()); 1277 dictionary->SetBoolean("cellularEnabled", cros_->cellular_enabled());
1277 } 1278 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698