OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/chromeos/dom_ui/internet_options_handler.h" | 5 #include "chrome/browser/chromeos/dom_ui/internet_options_handler.h" |
6 | 6 |
7 #include <ctype.h> | 7 #include <ctype.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 localized_strings->SetString("inetGateway", | 136 localized_strings->SetString("inetGateway", |
137 l10n_util::GetStringUTF16( | 137 l10n_util::GetStringUTF16( |
138 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_GATEWAY)); | 138 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_GATEWAY)); |
139 localized_strings->SetString("inetDns", | 139 localized_strings->SetString("inetDns", |
140 l10n_util::GetStringUTF16( | 140 l10n_util::GetStringUTF16( |
141 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DNSSERVER)); | 141 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DNSSERVER)); |
142 localized_strings->SetString("hardwareAddress", | 142 localized_strings->SetString("hardwareAddress", |
143 l10n_util::GetStringUTF16( | 143 l10n_util::GetStringUTF16( |
144 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_HARDWARE_ADDRESS)); | 144 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_HARDWARE_ADDRESS)); |
145 | 145 |
| 146 localized_strings->SetString("accessLockedMsg", |
| 147 l10n_util::GetStringUTF16( |
| 148 IDS_STATUSBAR_NETWORK_LOCKED)); |
146 localized_strings->SetString("inetSsid", | 149 localized_strings->SetString("inetSsid", |
147 l10n_util::GetStringUTF16( | 150 l10n_util::GetStringUTF16( |
148 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID)); | 151 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID)); |
149 localized_strings->SetString("inetIdent", | 152 localized_strings->SetString("inetIdent", |
150 l10n_util::GetStringUTF16( | 153 l10n_util::GetStringUTF16( |
151 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_IDENTITY)); | 154 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_IDENTITY)); |
152 localized_strings->SetString("inetCert", | 155 localized_strings->SetString("inetCert", |
153 l10n_util::GetStringUTF16( | 156 l10n_util::GetStringUTF16( |
154 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT)); | 157 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT)); |
155 localized_strings->SetString("inetCertPass", | 158 localized_strings->SetString("inetCertPass", |
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1021 chromeos::TYPE_WIFI, | 1024 chromeos::TYPE_WIFI, |
1022 true, | 1025 true, |
1023 chromeos::ACTIVATION_STATE_UNKNOWN, | 1026 chromeos::ACTIVATION_STATE_UNKNOWN, |
1024 false)); | 1027 false)); |
1025 } | 1028 } |
1026 return list; | 1029 return list; |
1027 } | 1030 } |
1028 | 1031 |
1029 void InternetOptionsHandler::FillNetworkInfo( | 1032 void InternetOptionsHandler::FillNetworkInfo( |
1030 DictionaryValue* dictionary, chromeos::NetworkLibrary* cros) { | 1033 DictionaryValue* dictionary, chromeos::NetworkLibrary* cros) { |
| 1034 dictionary->SetBoolean("accessLocked", cros->IsLocked()); |
1031 dictionary->Set("wiredList", GetWiredList()); | 1035 dictionary->Set("wiredList", GetWiredList()); |
1032 dictionary->Set("wirelessList", GetWirelessList()); | 1036 dictionary->Set("wirelessList", GetWirelessList()); |
1033 dictionary->Set("rememberedList", GetRememberedList()); | 1037 dictionary->Set("rememberedList", GetRememberedList()); |
1034 dictionary->SetBoolean("wifiAvailable", cros->wifi_available()); | 1038 dictionary->SetBoolean("wifiAvailable", cros->wifi_available()); |
1035 dictionary->SetBoolean("wifiEnabled", cros->wifi_enabled()); | 1039 dictionary->SetBoolean("wifiEnabled", cros->wifi_enabled()); |
1036 dictionary->SetBoolean("cellularAvailable", cros->cellular_available()); | 1040 dictionary->SetBoolean("cellularAvailable", cros->cellular_available()); |
1037 dictionary->SetBoolean("cellularEnabled", cros->cellular_enabled()); | 1041 dictionary->SetBoolean("cellularEnabled", cros->cellular_enabled()); |
1038 } | 1042 } |
OLD | NEW |