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

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

Issue 1006553002: Add third-party VPN support to network details dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_2_460428_add_ash_ui
Patch Set: Addressed comments. Created 5 years, 9 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
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/internet_options_handler.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) 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 "base/macros.h" 7 #include "base/macros.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
11 11
12 namespace chromeos { 12 namespace chromeos {
13 namespace internet_options_strings { 13 namespace internet_options_strings {
14 14
15 namespace { 15 namespace {
16 16
17 struct StringResource { 17 struct StringResource {
18 const char* name; 18 const char* name;
19 int id; 19 int id;
20 }; 20 };
21 21
22 StringResource kStringResources[] = { 22 StringResource kStringResources[] = {
23 // Main settings page. 23 // Main settings page.
24 {"ethernetName", IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET}, 24 {"ethernetName", IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET},
25 {"ethernetTitle", IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET}, 25 {"ethernetTitle", IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET},
26 {"wifiTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIFI_NETWORK}, 26 {"wifiTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIFI_NETWORK},
27 {"wimaxTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIMAX_NETWORK}, 27 {"wimaxTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIMAX_NETWORK},
28 {"cellularTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_CELLULAR_NETWORK}, 28 {"cellularTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_CELLULAR_NETWORK},
29 {"vpnTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_PRIVATE_NETWORK}, 29 {"vpnTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_PRIVATE_NETWORK},
30 {"vpnNameTemplate",
31 IDS_OPTIONS_SETTINGS_SECTION_THIRD_PARTY_VPN_NAME_TEMPLATE},
30 {"joinOtherNetwork", IDS_OPTIONS_SETTINGS_NETWORK_OTHER}, 32 {"joinOtherNetwork", IDS_OPTIONS_SETTINGS_NETWORK_OTHER},
31 {"networkDisabled", IDS_OPTIONS_SETTINGS_NETWORK_DISABLED}, 33 {"networkDisabled", IDS_OPTIONS_SETTINGS_NETWORK_DISABLED},
32 {"turnOffWifi", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_WIFI}, 34 {"turnOffWifi", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_WIFI},
33 {"turnOffWimax", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_WIMAX}, 35 {"turnOffWimax", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_WIMAX},
34 {"turnOffCellular", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_CELLULAR}, 36 {"turnOffCellular", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_CELLULAR},
35 {"disconnectNetwork", IDS_OPTIONS_SETTINGS_DISCONNECT}, 37 {"disconnectNetwork", IDS_OPTIONS_SETTINGS_DISCONNECT},
36 {"preferredNetworks", IDS_OPTIONS_SETTINGS_PREFERRED_NETWORKS_LABEL}, 38 {"preferredNetworks", IDS_OPTIONS_SETTINGS_PREFERRED_NETWORKS_LABEL},
37 {"preferredNetworksPage", IDS_OPTIONS_SETTINGS_PREFERRED_NETWORKS_TITLE}, 39 {"preferredNetworksPage", IDS_OPTIONS_SETTINGS_PREFERRED_NETWORKS_TITLE},
38 {"useSharedProxies", IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES}, 40 {"useSharedProxies", IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES},
39 { "addConnectionTitle", 41 {"addConnectionTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_ADD_CONNECTION},
40 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ADD_CONNECTION },
41 {"addConnectionWifi", IDS_OPTIONS_SETTINGS_ADD_CONNECTION_WIFI}, 42 {"addConnectionWifi", IDS_OPTIONS_SETTINGS_ADD_CONNECTION_WIFI},
42 {"addConnectionVPN", IDS_STATUSBAR_NETWORK_ADD_VPN}, 43 {"addConnectionVPN", IDS_STATUSBAR_NETWORK_ADD_VPN},
43 {"otherCellularNetworks", IDS_OPTIONS_SETTINGS_OTHER_CELLULAR_NETWORKS}, 44 {"otherCellularNetworks", IDS_OPTIONS_SETTINGS_OTHER_CELLULAR_NETWORKS},
44 {"enableDataRoaming", IDS_OPTIONS_SETTINGS_ENABLE_DATA_ROAMING}, 45 {"enableDataRoaming", IDS_OPTIONS_SETTINGS_ENABLE_DATA_ROAMING},
45 {"disableDataRoaming", IDS_OPTIONS_SETTINGS_DISABLE_DATA_ROAMING}, 46 {"disableDataRoaming", IDS_OPTIONS_SETTINGS_DISABLE_DATA_ROAMING},
46 {"dataRoamingDisableToggleTooltip", 47 {"dataRoamingDisableToggleTooltip",
47 IDS_OPTIONS_SETTINGS_TOGGLE_DATA_ROAMING_RESTRICTION}, 48 IDS_OPTIONS_SETTINGS_TOGGLE_DATA_ROAMING_RESTRICTION},
48 49
49 // ONC network states. Format is 'Onc' + key + value. 50 // ONC network states. Format is 'Onc' + key + value.
50 // Note: '.' must be replaced with '-', e.g. VPN.Type -> OncVPN-Type 51 // Note: '.' must be replaced with '-', e.g. VPN.Type -> OncVPN-Type
(...skipping 14 matching lines...) Expand all
65 IDS_CHROMEOS_NETWORK_ROAMING_STATE_ROAMING}, 66 IDS_CHROMEOS_NETWORK_ROAMING_STATE_ROAMING},
66 {"OncTypeCellular", IDS_NETWORK_TYPE_CELLULAR}, 67 {"OncTypeCellular", IDS_NETWORK_TYPE_CELLULAR},
67 {"OncTypeEthernet", IDS_NETWORK_TYPE_ETHERNET}, 68 {"OncTypeEthernet", IDS_NETWORK_TYPE_ETHERNET},
68 {"OncTypeWiFi", IDS_NETWORK_TYPE_WIFI}, 69 {"OncTypeWiFi", IDS_NETWORK_TYPE_WIFI},
69 {"OncTypeWimax", IDS_NETWORK_TYPE_WIMAX}, 70 {"OncTypeWimax", IDS_NETWORK_TYPE_WIMAX},
70 {"OncVPN-TypeL2TP-IPsecCert", 71 {"OncVPN-TypeL2TP-IPsecCert",
71 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_L2TP_IPSEC_USER_CERT}, 72 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_L2TP_IPSEC_USER_CERT},
72 {"OncVPN-TypeL2TP-IPsecPSK", 73 {"OncVPN-TypeL2TP-IPsecPSK",
73 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_L2TP_IPSEC_PSK}, 74 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_L2TP_IPSEC_PSK},
74 {"OncVPN-TypeOpenVPN", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_OPEN_VPN}, 75 {"OncVPN-TypeOpenVPN", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_OPEN_VPN},
76 {"OncVPN-TypeThirdPartyVPN",
77 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_THIRD_PARTY_VPN},
75 78
76 // Internet details dialog. 79 // Internet details dialog.
77 {"restrictedNo", IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL}, 80 {"restrictedNo", IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL},
78 {"restrictedYes", IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL}, 81 {"restrictedYes", IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL},
79 {"managedNetwork", IDS_OPTIONS_SETTINGS_MANAGED_NETWORK}, 82 {"managedNetwork", IDS_OPTIONS_SETTINGS_MANAGED_NETWORK},
80 {"wifiNetworkTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_CONNECTION}, 83 {"wifiNetworkTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_CONNECTION},
81 {"vpnTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_VPN}, 84 {"vpnTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_VPN},
82 {"cellularConnTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_CONNECTION}, 85 {"cellularConnTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_CONNECTION},
83 {"cellularDeviceTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_DEVICE}, 86 {"cellularDeviceTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_DEVICE},
84 {"networkTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_NETWORK}, 87 {"networkTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_NETWORK},
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PREFER_NETWORK}, 132 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PREFER_NETWORK},
130 {"inetAutoConnectNetwork", 133 {"inetAutoConnectNetwork",
131 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT}, 134 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT},
132 135
133 // VPN Tab. 136 // VPN Tab.
134 {"inetServiceName", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVICE_NAME}, 137 {"inetServiceName", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVICE_NAME},
135 {"inetServerHostname", 138 {"inetServerHostname",
136 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVER_HOSTNAME}, 139 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVER_HOSTNAME},
137 {"inetProviderType", 140 {"inetProviderType",
138 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_PROVIDER_TYPE}, 141 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_PROVIDER_TYPE},
142 {"inetProviderName",
143 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_PROVIDER_NAME},
139 {"inetUsername", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_USERNAME}, 144 {"inetUsername", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_USERNAME},
140 145
141 // Cellular Tab. 146 // Cellular Tab.
142 {"serviceName", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_SERVICE_NAME}, 147 {"serviceName", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_SERVICE_NAME},
143 {"networkTechnology", 148 {"networkTechnology",
144 IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_NETWORK_TECHNOLOGY}, 149 IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_NETWORK_TECHNOLOGY},
145 {"operatorName", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_OPERATOR}, 150 {"operatorName", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_OPERATOR},
146 {"operatorCode", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_OPERATOR_CODE}, 151 {"operatorCode", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_OPERATOR_CODE},
147 {"activationState", 152 {"activationState",
148 IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_ACTIVATION_STATE}, 153 IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_ACTIVATION_STATE},
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 void RegisterLocalizedStrings(base::DictionaryValue* localized_strings) { 187 void RegisterLocalizedStrings(base::DictionaryValue* localized_strings) {
183 for (size_t i = 0; i < kStringResourcesLength; ++i) { 188 for (size_t i = 0; i < kStringResourcesLength; ++i) {
184 localized_strings->SetString( 189 localized_strings->SetString(
185 kStringResources[i].name, 190 kStringResources[i].name,
186 l10n_util::GetStringUTF16(kStringResources[i].id)); 191 l10n_util::GetStringUTF16(kStringResources[i].id));
187 } 192 }
188 } 193 }
189 194
190 } // namespace internet_options_strings 195 } // namespace internet_options_strings
191 } // namespace chromeos 196 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698