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

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

Issue 2338103002: CrOS MD - use vectorized icons for ethernet and VPN. (Closed)
Patch Set: rename Wifi to Mobile Created 4 years, 3 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 | « no previous file | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/network/tray_vpn.cc
diff --git a/ash/common/system/chromeos/network/tray_vpn.cc b/ash/common/system/chromeos/network/tray_vpn.cc
index 9fefa147ce356f9b014586f0777f1b285f000742..a159893a5a2874875fecb4980562799227acd592 100644
--- a/ash/common/system/chromeos/network/tray_vpn.cc
+++ b/ash/common/system/chromeos/network/tray_vpn.cc
@@ -87,9 +87,8 @@ class VpnDefaultView : public TrayItemMore,
NetworkHandler::Get()->network_state_handler();
const NetworkState* vpn =
handler->FirstNetworkByType(NetworkTypePattern::VPN());
+ *image = ui::network_icon::GetVpnImage();
if (!vpn || (!vpn->IsConnectedState() && !vpn->IsConnectingState())) {
- *image = ui::network_icon::GetImageForDisconnectedNetwork(
- ui::network_icon::ICON_TYPE_DEFAULT_VIEW, shill::kTypeVPN);
if (label) {
*label =
l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_VPN_DISCONNECTED);
@@ -98,8 +97,6 @@ class VpnDefaultView : public TrayItemMore,
return;
}
*animating = vpn->IsConnectingState();
- *image = ui::network_icon::GetImageForNetwork(
- vpn, ui::network_icon::ICON_TYPE_DEFAULT_VIEW);
if (label) {
*label = ui::network_icon::GetLabelForNetwork(
vpn, ui::network_icon::ICON_TYPE_DEFAULT_VIEW);
« no previous file with comments | « no previous file | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698