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

Unified Diff: ash/common/system/chromeos/network/network_state_list_detailed_view.cc

Issue 2781233002: ChromeOS - Fix some network related strings. (Closed)
Patch Set: no vpn Created 3 years, 9 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 | « ash/ash_strings.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/network/network_state_list_detailed_view.cc
diff --git a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
index aa8275aa2363b3077c0d6fa7d4530f2243159759..267b0f99444c6f328b4af73cdf96118b3b2b49eb 100644
--- a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
@@ -419,15 +419,12 @@ views::View* NetworkStateListDetailedView::CreateNetworkInfoView() {
}
}
- std::string ethernet_address, wifi_address, vpn_address;
+ std::string ethernet_address, wifi_address;
if (list_type_ != LIST_TYPE_VPN) {
ethernet_address = handler->FormattedHardwareAddressForType(
NetworkTypePattern::Ethernet());
wifi_address =
handler->FormattedHardwareAddressForType(NetworkTypePattern::WiFi());
- } else {
- vpn_address =
- handler->FormattedHardwareAddressForType(NetworkTypePattern::VPN());
}
base::string16 bubble_text;
@@ -441,11 +438,10 @@ views::View* NetworkStateListDetailedView::CreateNetworkInfoView() {
}
};
- add_line(ip_address, IDS_ASH_STATUS_TRAY_IP);
- add_line(ipv6_address, IDS_ASH_STATUS_TRAY_IPV6);
- add_line(ethernet_address, IDS_ASH_STATUS_TRAY_ETHERNET);
- add_line(wifi_address, IDS_ASH_STATUS_TRAY_WIFI);
- add_line(vpn_address, IDS_ASH_STATUS_TRAY_VPN);
+ add_line(ip_address, IDS_ASH_STATUS_TRAY_IP_ADDRESS);
+ add_line(ipv6_address, IDS_ASH_STATUS_TRAY_IPV6_ADDRESS);
+ add_line(ethernet_address, IDS_ASH_STATUS_TRAY_ETHERNET_ADDRESS);
+ add_line(wifi_address, IDS_ASH_STATUS_TRAY_WIFI_ADDRESS);
// Avoid an empty bubble in the unlikely event that there is no network
// information at all.
« no previous file with comments | « ash/ash_strings.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698