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

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

Issue 2696193002: Remove non-md code from tray_vpn.cc (Closed)
Patch Set: Created 3 years, 10 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/common/system/chromeos/network/network_icon.h ('k') | ash/common/system/chromeos/network/tray_vpn.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/network/network_icon.cc
diff --git a/ash/common/system/chromeos/network/network_icon.cc b/ash/common/system/chromeos/network/network_icon.cc
index 021b84ef0707862433de25cf1254bd66acffac28..26a2beeac81a43180bf59a066203cbd4ce287594 100644
--- a/ash/common/system/chromeos/network/network_icon.cc
+++ b/ash/common/system/chromeos/network/network_icon.cc
@@ -526,7 +526,8 @@ gfx::ImageSkia GetIcon(const NetworkState* network,
strength_index);
} else if (network->Matches(NetworkTypePattern::VPN())) {
DCHECK_NE(ICON_TYPE_TRAY, icon_type);
- return GetVpnImage();
+ return gfx::CreateVectorIcon(kNetworkVpnIcon,
+ GetDefaultColorForIconType(ICON_TYPE_LIST));
}
NOTREACHED() << "Request for icon for unsupported type: " << network->type();
@@ -779,11 +780,6 @@ gfx::ImageSkia GetImageForNewWifiNetwork(SkColor icon_color,
return NetworkIconImageSource::CreateImage(icon, badges);
}
-gfx::ImageSkia GetVpnImage() {
- return gfx::CreateVectorIcon(kNetworkVpnIcon,
- GetDefaultColorForIconType(ICON_TYPE_LIST));
-}
-
base::string16 GetLabelForNetwork(const chromeos::NetworkState* network,
IconType icon_type) {
DCHECK(network);
« no previous file with comments | « ash/common/system/chromeos/network/network_icon.h ('k') | ash/common/system/chromeos/network/tray_vpn.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698