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

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

Issue 1017443002: Allow users to add third-party VPNs from the settings page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_3_460428_update_details_dialog
Patch Set: Fixed closure errors. 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
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"
(...skipping 22 matching lines...) Expand all
33 {"networkDisabled", IDS_OPTIONS_SETTINGS_NETWORK_DISABLED}, 33 {"networkDisabled", IDS_OPTIONS_SETTINGS_NETWORK_DISABLED},
34 {"turnOffWifi", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_WIFI}, 34 {"turnOffWifi", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_WIFI},
35 {"turnOffWimax", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_WIMAX}, 35 {"turnOffWimax", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_WIMAX},
36 {"turnOffCellular", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_CELLULAR}, 36 {"turnOffCellular", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_CELLULAR},
37 {"disconnectNetwork", IDS_OPTIONS_SETTINGS_DISCONNECT}, 37 {"disconnectNetwork", IDS_OPTIONS_SETTINGS_DISCONNECT},
38 {"preferredNetworks", IDS_OPTIONS_SETTINGS_PREFERRED_NETWORKS_LABEL}, 38 {"preferredNetworks", IDS_OPTIONS_SETTINGS_PREFERRED_NETWORKS_LABEL},
39 {"preferredNetworksPage", IDS_OPTIONS_SETTINGS_PREFERRED_NETWORKS_TITLE}, 39 {"preferredNetworksPage", IDS_OPTIONS_SETTINGS_PREFERRED_NETWORKS_TITLE},
40 {"useSharedProxies", IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES}, 40 {"useSharedProxies", IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES},
41 {"addConnectionTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_ADD_CONNECTION}, 41 {"addConnectionTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_ADD_CONNECTION},
42 {"addConnectionWifi", IDS_OPTIONS_SETTINGS_ADD_CONNECTION_WIFI}, 42 {"addConnectionWifi", IDS_OPTIONS_SETTINGS_ADD_CONNECTION_WIFI},
43 {"addConnectionVPN", IDS_STATUSBAR_NETWORK_ADD_VPN}, 43 {"addConnectionVPNTemplate", IDS_OPTIONS_SETTINGS_ADD_VPN_TEMPLATE},
44 {"otherCellularNetworks", IDS_OPTIONS_SETTINGS_OTHER_CELLULAR_NETWORKS}, 44 {"otherCellularNetworks", IDS_OPTIONS_SETTINGS_OTHER_CELLULAR_NETWORKS},
45 {"enableDataRoaming", IDS_OPTIONS_SETTINGS_ENABLE_DATA_ROAMING}, 45 {"enableDataRoaming", IDS_OPTIONS_SETTINGS_ENABLE_DATA_ROAMING},
46 {"disableDataRoaming", IDS_OPTIONS_SETTINGS_DISABLE_DATA_ROAMING}, 46 {"disableDataRoaming", IDS_OPTIONS_SETTINGS_DISABLE_DATA_ROAMING},
47 {"dataRoamingDisableToggleTooltip", 47 {"dataRoamingDisableToggleTooltip",
48 IDS_OPTIONS_SETTINGS_TOGGLE_DATA_ROAMING_RESTRICTION}, 48 IDS_OPTIONS_SETTINGS_TOGGLE_DATA_ROAMING_RESTRICTION},
49 49
50 // ONC network states. Format is 'Onc' + key + value. 50 // ONC network states. Format is 'Onc' + key + value.
51 // Note: '.' must be replaced with '-', e.g. VPN.Type -> OncVPN-Type 51 // Note: '.' must be replaced with '-', e.g. VPN.Type -> OncVPN-Type
52 {"OncCellular-ActivationStateActivated", 52 {"OncCellular-ActivationStateActivated",
53 IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_ACTIVATED}, 53 IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_ACTIVATED},
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 void RegisterLocalizedStrings(base::DictionaryValue* localized_strings) { 187 void RegisterLocalizedStrings(base::DictionaryValue* localized_strings) {
188 for (size_t i = 0; i < kStringResourcesLength; ++i) { 188 for (size_t i = 0; i < kStringResourcesLength; ++i) {
189 localized_strings->SetString( 189 localized_strings->SetString(
190 kStringResources[i].name, 190 kStringResources[i].name,
191 l10n_util::GetStringUTF16(kStringResources[i].id)); 191 l10n_util::GetStringUTF16(kStringResources[i].id));
192 } 192 }
193 } 193 }
194 194
195 } // namespace internet_options_strings 195 } // namespace internet_options_strings
196 } // namespace chromeos 196 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc ('k') | tools/metrics/actions/actions.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698