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

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: Prepare for removal of GetManagedPropertiesResult() by tracking VPN providers and networks separate… 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
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",
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PREFER_NETWORK}, 131 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PREFER_NETWORK},
130 {"inetAutoConnectNetwork", 132 {"inetAutoConnectNetwork",
131 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT}, 133 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT},
132 134
133 // VPN Tab. 135 // VPN Tab.
134 {"inetServiceName", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVICE_NAME}, 136 {"inetServiceName", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVICE_NAME},
135 {"inetServerHostname", 137 {"inetServerHostname",
136 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVER_HOSTNAME}, 138 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVER_HOSTNAME},
137 {"inetProviderType", 139 {"inetProviderType",
138 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_PROVIDER_TYPE}, 140 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_PROVIDER_TYPE},
141 {"inetProviderName",
142 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_PROVIDER_NAME},
139 {"inetUsername", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_USERNAME}, 143 {"inetUsername", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_USERNAME},
140 144
141 // Cellular Tab. 145 // Cellular Tab.
142 {"serviceName", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_SERVICE_NAME}, 146 {"serviceName", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_SERVICE_NAME},
143 {"networkTechnology", 147 {"networkTechnology",
144 IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_NETWORK_TECHNOLOGY}, 148 IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_NETWORK_TECHNOLOGY},
145 {"operatorName", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_OPERATOR}, 149 {"operatorName", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_OPERATOR},
146 {"operatorCode", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_OPERATOR_CODE}, 150 {"operatorCode", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_OPERATOR_CODE},
147 {"activationState", 151 {"activationState",
148 IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_ACTIVATION_STATE}, 152 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) { 186 void RegisterLocalizedStrings(base::DictionaryValue* localized_strings) {
183 for (size_t i = 0; i < kStringResourcesLength; ++i) { 187 for (size_t i = 0; i < kStringResourcesLength; ++i) {
184 localized_strings->SetString( 188 localized_strings->SetString(
185 kStringResources[i].name, 189 kStringResources[i].name,
186 l10n_util::GetStringUTF16(kStringResources[i].id)); 190 l10n_util::GetStringUTF16(kStringResources[i].id));
187 } 191 }
188 } 192 }
189 193
190 } // namespace internet_options_strings 194 } // namespace internet_options_strings
191 } // namespace chromeos 195 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698