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

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

Issue 2510083006: chromeos: Move ownership of ash VPN provider list from chrome into ash (Closed)
Patch Set: Collapse VPNProvider::Key and VPNProvider structs Created 4 years 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/common/strings/grit/ash_strings.h"
9 #include "base/macros.h" 10 #include "base/macros.h"
10 #include "base/values.h" 11 #include "base/values.h"
11 #include "chrome/grit/generated_resources.h" 12 #include "chrome/grit/generated_resources.h"
12 #include "components/strings/grit/components_strings.h" 13 #include "components/strings/grit/components_strings.h"
13 #include "ui/base/l10n/l10n_util.h" 14 #include "ui/base/l10n/l10n_util.h"
14 #include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
15 15
16 namespace chromeos { 16 namespace chromeos {
17 namespace internet_options_strings { 17 namespace internet_options_strings {
18 18
19 namespace { 19 namespace {
20 20
21 struct StringResource { 21 struct StringResource {
22 const char* name; 22 const char* name;
23 int id; 23 int id;
24 }; 24 };
25 25
26 StringResource kStringResources[] = { 26 StringResource kStringResources[] = {
27 // Main settings page. 27 // Main settings page.
28 {"ethernetName", IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET}, 28 {"ethernetName", IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET},
29 {"ethernetTitle", IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET}, 29 {"ethernetTitle", IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET},
30 {"wifiTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIFI_NETWORK}, 30 {"wifiTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIFI_NETWORK},
31 {"wimaxTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIMAX_NETWORK}, 31 {"wimaxTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIMAX_NETWORK},
32 {"cellularTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_CELLULAR_NETWORK}, 32 {"cellularTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_CELLULAR_NETWORK},
33 {"vpnTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_PRIVATE_NETWORK}, 33 {"vpnTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_PRIVATE_NETWORK},
34 {"vpnNameTemplate", 34 {"vpnNameTemplate",
35 IDS_OPTIONS_SETTINGS_SECTION_THIRD_PARTY_VPN_NAME_TEMPLATE}, 35 IDS_OPTIONS_SETTINGS_SECTION_THIRD_PARTY_VPN_NAME_TEMPLATE},
36 {"defaultThirdPartyProviderName", 36 {"defaultThirdPartyProviderName",
37 IDS_OPTIONS_SETTINGS_SECTION_DEFAULT_THIRD_PARTY_PROVIDER_NAME}, 37 IDS_OPTIONS_SETTINGS_SECTION_DEFAULT_THIRD_PARTY_PROVIDER_NAME},
38 {"vpnBuiltInProvider", IDS_NETWORK_VPN_BUILT_IN_PROVIDER}, 38 {"vpnBuiltInProvider", IDS_ASH_STATUS_TRAY_VPN_BUILT_IN_PROVIDER},
39 {"joinOtherNetwork", IDS_OPTIONS_SETTINGS_NETWORK_OTHER}, 39 {"joinOtherNetwork", IDS_OPTIONS_SETTINGS_NETWORK_OTHER},
40 {"networkDisabled", IDS_OPTIONS_SETTINGS_NETWORK_DISABLED}, 40 {"networkDisabled", IDS_OPTIONS_SETTINGS_NETWORK_DISABLED},
41 {"networkProhibited", IDS_OPTIONS_SETTINGS_NETWORK_PROHIBITED}, 41 {"networkProhibited", IDS_OPTIONS_SETTINGS_NETWORK_PROHIBITED},
42 {"turnOffWifi", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_WIFI}, 42 {"turnOffWifi", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_WIFI},
43 {"turnOffWimax", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_WIMAX}, 43 {"turnOffWimax", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_WIMAX},
44 {"turnOffCellular", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_CELLULAR}, 44 {"turnOffCellular", IDS_OPTIONS_SETTINGS_NETWORK_DISABLE_CELLULAR},
45 {"disconnectNetwork", IDS_OPTIONS_SETTINGS_DISCONNECT}, 45 {"disconnectNetwork", IDS_OPTIONS_SETTINGS_DISCONNECT},
46 {"preferredNetworks", IDS_OPTIONS_SETTINGS_PREFERRED_NETWORKS_LABEL}, 46 {"preferredNetworks", IDS_OPTIONS_SETTINGS_PREFERRED_NETWORKS_LABEL},
47 {"preferredNetworksPage", IDS_OPTIONS_SETTINGS_PREFERRED_NETWORKS_TITLE}, 47 {"preferredNetworksPage", IDS_OPTIONS_SETTINGS_PREFERRED_NETWORKS_TITLE},
48 {"useSharedProxies", IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES}, 48 {"useSharedProxies", IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES},
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 void RegisterLocalizedStrings(base::DictionaryValue* localized_strings) { 198 void RegisterLocalizedStrings(base::DictionaryValue* localized_strings) {
199 for (size_t i = 0; i < kStringResourcesLength; ++i) { 199 for (size_t i = 0; i < kStringResourcesLength; ++i) {
200 localized_strings->SetString( 200 localized_strings->SetString(
201 kStringResources[i].name, 201 kStringResources[i].name,
202 l10n_util::GetStringUTF16(kStringResources[i].id)); 202 l10n_util::GetStringUTF16(kStringResources[i].id));
203 } 203 }
204 } 204 }
205 205
206 } // namespace internet_options_strings 206 } // namespace internet_options_strings
207 } // namespace chromeos 207 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698