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

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/settings/md_settings_localized_strings_provide r.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after
913 {"internetAddWiFi", IDS_SETTINGS_INTERNET_ADD_WIFI}, 913 {"internetAddWiFi", IDS_SETTINGS_INTERNET_ADD_WIFI},
914 {"internetConfigTitle", IDS_SETTINGS_INTERNET_CONFIG}, 914 {"internetConfigTitle", IDS_SETTINGS_INTERNET_CONFIG},
915 {"internetDetailPageTitle", IDS_SETTINGS_INTERNET_DETAIL}, 915 {"internetDetailPageTitle", IDS_SETTINGS_INTERNET_DETAIL},
916 {"internetDeviceEnabling", IDS_SETTINGS_INTERNET_DEVICE_ENABLING}, 916 {"internetDeviceEnabling", IDS_SETTINGS_INTERNET_DEVICE_ENABLING},
917 {"internetKnownNetworksPageTitle", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS}, 917 {"internetKnownNetworksPageTitle", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS},
918 {"internetMobileSearching", IDS_SETTINGS_INTERNET_MOBILE_SEARCH}, 918 {"internetMobileSearching", IDS_SETTINGS_INTERNET_MOBILE_SEARCH},
919 {"internetNoNetworks", IDS_SETTINGS_INTERNET_NO_NETWORKS}, 919 {"internetNoNetworks", IDS_SETTINGS_INTERNET_NO_NETWORKS},
920 {"internetPageTitle", IDS_SETTINGS_INTERNET}, 920 {"internetPageTitle", IDS_SETTINGS_INTERNET},
921 {"internetToggleMobileA11yLabel", 921 {"internetToggleMobileA11yLabel",
922 IDS_SETTINGS_INTERNET_TOGGLE_MOBILE_ACCESSIBILITY_LABEL}, 922 IDS_SETTINGS_INTERNET_TOGGLE_MOBILE_ACCESSIBILITY_LABEL},
923 {"internetToggleTetherA11yLabel", 923 {"internetToggleTetherLabel", IDS_SETTINGS_INTERNET_TOGGLE_TETHER_LABEL},
924 IDS_SETTINGS_INTERNET_TOGGLE_TETHER_ACCESSIBILITY_LABEL}, 924 {"internetToggleTetherSubtext",
925 IDS_SETTINGS_INTERNET_TOGGLE_TETHER_SUBTEXT},
925 {"internetToggleWiFiA11yLabel", 926 {"internetToggleWiFiA11yLabel",
926 IDS_SETTINGS_INTERNET_TOGGLE_WIFI_ACCESSIBILITY_LABEL}, 927 IDS_SETTINGS_INTERNET_TOGGLE_WIFI_ACCESSIBILITY_LABEL},
927 {"internetToggleWiMAXA11yLabel", 928 {"internetToggleWiMAXA11yLabel",
928 IDS_SETTINGS_INTERNET_TOGGLE_WIMAX_ACCESSIBILITY_LABEL}, 929 IDS_SETTINGS_INTERNET_TOGGLE_WIMAX_ACCESSIBILITY_LABEL},
929 {"knownNetworksAll", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_ALL}, 930 {"knownNetworksAll", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_ALL},
930 {"knownNetworksButton", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_BUTTON}, 931 {"knownNetworksButton", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_BUTTON},
931 {"knownNetworksMessage", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_MESSAGE}, 932 {"knownNetworksMessage", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_MESSAGE},
932 {"knownNetworksPreferred", 933 {"knownNetworksPreferred",
933 IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_PREFFERED}, 934 IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_PREFFERED},
934 {"knownNetworksMenuAddPreferred", 935 {"knownNetworksMenuAddPreferred",
(...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after
2148 2149
2149 #if defined(OS_CHROMEOS) 2150 #if defined(OS_CHROMEOS)
2150 chromeos::network_element::AddLocalizedStrings(html_source); 2151 chromeos::network_element::AddLocalizedStrings(html_source);
2151 #endif 2152 #endif
2152 policy_indicator::AddLocalizedStrings(html_source); 2153 policy_indicator::AddLocalizedStrings(html_source);
2153 2154
2154 html_source->SetJsonPath(kLocalizedStringsFile); 2155 html_source->SetJsonPath(kLocalizedStringsFile);
2155 } 2156 }
2156 2157
2157 } // namespace settings 2158 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698