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

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

Issue 7107005: Replace WPA and RSN with PSK in Other Wi-Fi network UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unused strings. Created 9 years, 6 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
« no previous file with comments | « chrome/browser/chromeos/options/wifi_config_view.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT)); 172 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT));
173 localized_strings->SetString("inetSharedNetwork", 173 localized_strings->SetString("inetSharedNetwork",
174 l10n_util::GetStringUTF16( 174 l10n_util::GetStringUTF16(
175 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SHARE_NETWORK)); 175 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SHARE_NETWORK));
176 localized_strings->SetString("inetLogin", 176 localized_strings->SetString("inetLogin",
177 l10n_util::GetStringUTF16( 177 l10n_util::GetStringUTF16(
178 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN)); 178 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN));
179 localized_strings->SetString("inetShowPass", 179 localized_strings->SetString("inetShowPass",
180 l10n_util::GetStringUTF16( 180 l10n_util::GetStringUTF16(
181 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SHOWPASSWORD)); 181 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SHOWPASSWORD));
182 localized_strings->SetString("inetSecurityNone",
183 l10n_util::GetStringFUTF16(
184 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_SELECT,
185 l10n_util::GetStringUTF16(
186 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_NONE)));
187 localized_strings->SetString("inetSecurityWEP",
188 l10n_util::GetStringFUTF16(
189 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_SELECT,
190 l10n_util::GetStringUTF16(
191 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_WEP)));
192 localized_strings->SetString("inetSecurityWPA",
193 l10n_util::GetStringFUTF16(
194 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_SELECT,
195 l10n_util::GetStringUTF16(
196 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_WPA)));
197 localized_strings->SetString("inetSecurityRSN",
198 l10n_util::GetStringFUTF16(
199 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_SELECT,
200 l10n_util::GetStringUTF16(
201 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_RSN)));
202 localized_strings->SetString("inetPassPrompt", 182 localized_strings->SetString("inetPassPrompt",
203 l10n_util::GetStringUTF16( 183 l10n_util::GetStringUTF16(
204 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSWORD)); 184 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSWORD));
205 localized_strings->SetString("inetSsidPrompt", 185 localized_strings->SetString("inetSsidPrompt",
206 l10n_util::GetStringUTF16( 186 l10n_util::GetStringUTF16(
207 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SSID)); 187 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SSID));
208 localized_strings->SetString("inetStatus", 188 localized_strings->SetString("inetStatus",
209 l10n_util::GetStringUTF16( 189 l10n_util::GetStringUTF16(
210 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_STATUS_TITLE)); 190 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_STATUS_TITLE));
211 localized_strings->SetString("inetConnect", 191 localized_strings->SetString("inetConnect",
(...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after
1201 dictionary->SetBoolean("accessLocked", cros_->IsLocked()); 1181 dictionary->SetBoolean("accessLocked", cros_->IsLocked());
1202 dictionary->Set("wiredList", GetWiredList()); 1182 dictionary->Set("wiredList", GetWiredList());
1203 dictionary->Set("wirelessList", GetWirelessList()); 1183 dictionary->Set("wirelessList", GetWirelessList());
1204 dictionary->Set("vpnList", GetVPNList()); 1184 dictionary->Set("vpnList", GetVPNList());
1205 dictionary->Set("rememberedList", GetRememberedList()); 1185 dictionary->Set("rememberedList", GetRememberedList());
1206 dictionary->SetBoolean("wifiAvailable", cros_->wifi_available()); 1186 dictionary->SetBoolean("wifiAvailable", cros_->wifi_available());
1207 dictionary->SetBoolean("wifiEnabled", cros_->wifi_enabled()); 1187 dictionary->SetBoolean("wifiEnabled", cros_->wifi_enabled());
1208 dictionary->SetBoolean("cellularAvailable", cros_->cellular_available()); 1188 dictionary->SetBoolean("cellularAvailable", cros_->cellular_available());
1209 dictionary->SetBoolean("cellularEnabled", cros_->cellular_enabled()); 1189 dictionary->SetBoolean("cellularEnabled", cros_->cellular_enabled());
1210 } 1190 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/wifi_config_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698