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

Unified Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 1277223002: Add cr-network-select element for selecting a Chrome OS network (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_515987_network_configure
Patch Set: Compile fix Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/chromeos/network_ui.cc ('k') | ui/chromeos/ui_chromeos_strings.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index b94d277fd2cee1fea72b66a90e58d82cabefafe1..809e449ecaf32e18a5ca1c352a2322ef6677a02e 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -13,6 +13,10 @@
#include "content/public/browser/web_ui_data_source.h"
#include "ui/base/l10n/l10n_util.h"
+#if defined(OS_CHROMEOS)
+#include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
+#endif
+
namespace {
// Note that md_settings.html contains a <script> tag which imports a script of
@@ -150,6 +154,23 @@ void AddInternetStrings(content::WebUIDataSource* html_source) {
"internetPageTitle", IDS_SETTINGS_INTERNET);
html_source->AddLocalizedString(
"internetDetailPageTitle", IDS_SETTINGS_INTERNET_DETAIL);
+
+ // Required by cr_network_list_item.js. TODO(stevenjb): Add to
+ // settings_strings.grdp or provide an alternative translation method.
+ // crbug.com/512214.
+ html_source->AddLocalizedString("networkConnected",
+ IDS_ASH_STATUS_TRAY_NETWORK_CONNECTED);
+ html_source->AddLocalizedString("networkConnecting",
+ IDS_ASH_STATUS_TRAY_NETWORK_CONNECTING);
+ html_source->AddLocalizedString("networkDisabled",
+ IDS_OPTIONS_SETTINGS_NETWORK_DISABLED);
+ html_source->AddLocalizedString("networkNotConnected",
+ IDS_ASH_STATUS_TRAY_NETWORK_NOT_CONNECTED);
+ html_source->AddLocalizedString("OncTypeCellular", IDS_NETWORK_TYPE_CELLULAR);
+ html_source->AddLocalizedString("OncTypeEthernet", IDS_NETWORK_TYPE_ETHERNET);
+ html_source->AddLocalizedString("OncTypeVPN", IDS_NETWORK_TYPE_VPN);
+ html_source->AddLocalizedString("OncTypeWiFi", IDS_NETWORK_TYPE_WIFI);
+ html_source->AddLocalizedString("OncTypeWimax", IDS_NETWORK_TYPE_WIMAX);
}
#endif
« no previous file with comments | « chrome/browser/ui/webui/chromeos/network_ui.cc ('k') | ui/chromeos/ui_chromeos_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698