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

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

Issue 2913323003: Settings: Network: Merge Tether networks into Mobile subpage (Closed)
Patch Set: Fix browser_tests Created 3 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
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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_stri ngs.h" 5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler_stri ngs.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "ash/strings/grit/ash_strings.h" 9 #include "ash/strings/grit/ash_strings.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_NOT_ACTIVATED}, 67 IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_NOT_ACTIVATED},
68 {"OncCellular-ActivationStatePartiallyActivated", 68 {"OncCellular-ActivationStatePartiallyActivated",
69 IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_PARTIALLY_ACTIVATED}, 69 IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_PARTIALLY_ACTIVATED},
70 {"OncConnectionStateConnected", IDS_CHROMEOS_NETWORK_STATE_CONNECTED}, 70 {"OncConnectionStateConnected", IDS_CHROMEOS_NETWORK_STATE_CONNECTED},
71 {"OncConnectionStateConnecting", IDS_CHROMEOS_NETWORK_STATE_CONNECTING}, 71 {"OncConnectionStateConnecting", IDS_CHROMEOS_NETWORK_STATE_CONNECTING},
72 {"OncConnectionStateNotConnected", 72 {"OncConnectionStateNotConnected",
73 IDS_CHROMEOS_NETWORK_STATE_NOT_CONNECTED}, 73 IDS_CHROMEOS_NETWORK_STATE_NOT_CONNECTED},
74 {"OncCellular-RoamingStateHome", IDS_CHROMEOS_NETWORK_ROAMING_STATE_HOME}, 74 {"OncCellular-RoamingStateHome", IDS_CHROMEOS_NETWORK_ROAMING_STATE_HOME},
75 {"OncCellular-RoamingStateRoaming", 75 {"OncCellular-RoamingStateRoaming",
76 IDS_CHROMEOS_NETWORK_ROAMING_STATE_ROAMING}, 76 IDS_CHROMEOS_NETWORK_ROAMING_STATE_ROAMING},
77 {"OncTypeCellular", IDS_NETWORK_TYPE_CELLULAR}, 77 {"OncTypeCellular", IDS_NETWORK_TYPE_MOBILE_DATA},
78 {"OncTypeEthernet", IDS_NETWORK_TYPE_ETHERNET}, 78 {"OncTypeEthernet", IDS_NETWORK_TYPE_ETHERNET},
79 {"OncTypeTether", IDS_NETWORK_TYPE_MOBILE_DATA},
79 {"OncTypeWiFi", IDS_NETWORK_TYPE_WIFI}, 80 {"OncTypeWiFi", IDS_NETWORK_TYPE_WIFI},
80 {"OncTypeWimax", IDS_NETWORK_TYPE_WIMAX}, 81 {"OncTypeWimax", IDS_NETWORK_TYPE_WIMAX},
81 {"OncVPN-TypeL2TP-IPsecCert", 82 {"OncVPN-TypeL2TP-IPsecCert",
82 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_L2TP_IPSEC_USER_CERT}, 83 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_L2TP_IPSEC_USER_CERT},
83 {"OncVPN-TypeL2TP-IPsecPSK", 84 {"OncVPN-TypeL2TP-IPsecPSK",
84 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_L2TP_IPSEC_PSK}, 85 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_L2TP_IPSEC_PSK},
85 {"OncVPN-TypeOpenVPN", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_OPEN_VPN}, 86 {"OncVPN-TypeOpenVPN", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_OPEN_VPN},
86 {"OncVPN-TypeThirdPartyVPN", 87 {"OncVPN-TypeThirdPartyVPN",
87 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_THIRD_PARTY_VPN}, 88 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_THIRD_PARTY_VPN},
88 89
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 void RegisterLocalizedStrings(base::DictionaryValue* localized_strings) { 199 void RegisterLocalizedStrings(base::DictionaryValue* localized_strings) {
199 for (size_t i = 0; i < kStringResourcesLength; ++i) { 200 for (size_t i = 0; i < kStringResourcesLength; ++i) {
200 localized_strings->SetString( 201 localized_strings->SetString(
201 kStringResources[i].name, 202 kStringResources[i].name,
202 l10n_util::GetStringUTF16(kStringResources[i].id)); 203 l10n_util::GetStringUTF16(kStringResources[i].id));
203 } 204 }
204 } 205 }
205 206
206 } // namespace internet_options_strings 207 } // namespace internet_options_strings
207 } // namespace chromeos 208 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698