Commit 61d74d94 authored by Claude van der Merwe's avatar Claude van der Merwe Committed by Commit Bot

Remove duplicate network name in Internet Detail Dialog

In the ChromeOS internet detail dialog the network name was displayed in
the dialog title and at the top of the window.

Bug: 1040483
Change-Id: I0cff1bd67205d87150e0e2345168a23d7a713c74
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2318692
Commit-Queue: Claude van der Merwe <cvandermerwe@google.com>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarJon Mann <jonmann@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792078}
parent 5b5f4273
......@@ -60,12 +60,6 @@ void AddInternetStrings(content::WebUIDataSource* html_source) {
html_source->AddLocalizedString(entry.name, entry.id);
}
base::string16 GetNetworkName16(const NetworkState& network) {
return network.Matches(NetworkTypePattern::Ethernet())
? l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_ETHERNET)
: base::UTF8ToUTF16(network.name());
}
std::string GetNetworkName8(const NetworkState& network) {
return network.Matches(NetworkTypePattern::Ethernet())
? l10n_util::GetStringUTF8(IDS_NETWORK_TYPE_ETHERNET)
......@@ -103,7 +97,7 @@ void InternetDetailDialog::ShowDialog(const std::string& network_id) {
InternetDetailDialog::InternetDetailDialog(const NetworkState& network)
: SystemWebDialogDelegate(GURL(chrome::kChromeUIIntenetDetailDialogURL),
GetNetworkName16(network)),
/* title= */ base::string16()),
network_id_(network.guid()),
network_type_(network_util::TranslateShillTypeToONC(network.type())),
network_name_(GetNetworkName8(network)) {
......
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