Commit 1cc484c9 authored by Regan Hsu's avatar Regan Hsu Committed by Commit Bot

[CrOS Settings] Move Network element strings from browser to OS.

Move OS Network element strings from browser string provider to
OS string provider.

Bug: 967888
Change-Id: Idfc743fedaa742e97f2ac025da63da1d05e4305e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2018257
Commit-Queue: Regan Hsu <hsuregan@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736037}
parent 2d5aa49b
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_utils.h" #include "chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_utils.h"
#include "chrome/browser/ui/webui/chromeos/bluetooth_dialog_localized_strings_provider.h" #include "chrome/browser/ui/webui/chromeos/bluetooth_dialog_localized_strings_provider.h"
#include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.h"
#include "chrome/browser/ui/webui/chromeos/smb_shares/smb_shares_localized_strings_provider.h" #include "chrome/browser/ui/webui/chromeos/smb_shares/smb_shares_localized_strings_provider.h"
#include "chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.h" #include "chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.h"
#include "chrome/browser/ui/webui/webui_util.h" #include "chrome/browser/ui/webui/webui_util.h"
...@@ -994,6 +995,12 @@ void AddInternetStrings(content::WebUIDataSource* html_source) { ...@@ -994,6 +995,12 @@ void AddInternetStrings(content::WebUIDataSource* html_source) {
}; };
AddLocalizedStringsBulk(html_source, kLocalizedStrings); AddLocalizedStringsBulk(html_source, kLocalizedStrings);
chromeos::network_element::AddLocalizedStrings(html_source);
chromeos::network_element::AddOncLocalizedStrings(html_source);
chromeos::network_element::AddDetailsLocalizedStrings(html_source);
chromeos::network_element::AddConfigLocalizedStrings(html_source);
chromeos::network_element::AddErrorLocalizedStrings(html_source);
html_source->AddString("networkGoogleNameserversLearnMoreUrl", html_source->AddString("networkGoogleNameserversLearnMoreUrl",
chrome::kGoogleNameserversLearnMoreURL); chrome::kGoogleNameserversLearnMoreURL);
html_source->AddString( html_source->AddString(
......
...@@ -89,7 +89,6 @@ ...@@ -89,7 +89,6 @@
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h" #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "chrome/common/webui_url_constants.h" #include "chrome/common/webui_url_constants.h"
#include "chromeos/constants/chromeos_features.h" #include "chromeos/constants/chromeos_features.h"
...@@ -2484,13 +2483,6 @@ void AddBrowserLocalizedStrings(content::WebUIDataSource* html_source, ...@@ -2484,13 +2483,6 @@ void AddBrowserLocalizedStrings(content::WebUIDataSource* html_source,
certificate_manager::AddLocalizedStrings(html_source); certificate_manager::AddLocalizedStrings(html_source);
#endif #endif
#if defined(OS_CHROMEOS)
chromeos::network_element::AddLocalizedStrings(html_source);
chromeos::network_element::AddOncLocalizedStrings(html_source);
chromeos::network_element::AddDetailsLocalizedStrings(html_source);
chromeos::network_element::AddConfigLocalizedStrings(html_source);
chromeos::network_element::AddErrorLocalizedStrings(html_source);
#endif
policy_indicator::AddLocalizedStrings(html_source); policy_indicator::AddLocalizedStrings(html_source);
AddSecurityKeysStrings(html_source); AddSecurityKeysStrings(html_source);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment