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

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

Issue 2761313003: Update appearance of Wi-Fi toggle notification. (Closed)
Patch Set: one more rename 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
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 d4297bc2a4e1dfafa00b9c222e17dddf0d3b0cfa..001a7dd705f0e347fdff76602c87dea5cb3a55e7 100644
--- a/ash/common/system/chromeos/network/network_icon.cc
+++ b/ash/common/system/chromeos/network/network_icon.cc
@@ -61,6 +61,7 @@ const int kMenuIconBadgeOffset = 2;
struct Badges {
gfx::ImageSkia top_left;
gfx::ImageSkia top_right;
+ gfx::ImageSkia center;
gfx::ImageSkia bottom_left;
gfx::ImageSkia bottom_right;
};
@@ -224,6 +225,10 @@ class NetworkIconImageSource : public gfx::CanvasImageSource {
canvas->DrawImageInt(badges_.top_right, width - badges_.top_right.width(),
top_badge_y);
}
+ if (!badges_.center.isNull()) {
+ canvas->DrawImageInt(badges_.center, (width - badges_.center.width()) / 2,
+ (height - badges_.center.height()) / 2);
+ }
if (!badges_.bottom_left.isNull()) {
canvas->DrawImageInt(badges_.bottom_left, 0,
height - badges_.bottom_left.height());
@@ -780,6 +785,17 @@ gfx::ImageSkia GetImageForNewWifiNetwork(SkColor icon_color,
return NetworkIconImageSource::CreateImage(icon, badges);
}
+gfx::ImageSkia GetImageForWifiChipState(bool enabled) {
+ SignalStrengthImageSource* source =
+ new SignalStrengthImageSource(ImageTypeForNetworkType(shill::kTypeWifi),
+ ICON_TYPE_LIST, kNumNetworkImages - 1);
+ gfx::ImageSkia icon = gfx::ImageSkia(source, source->size());
+ Badges badges;
+ if (!enabled)
+ badges.center = gfx::CreateVectorIcon(kNetworkBadgeOffIcon, kMenuIconColor);
+ return NetworkIconImageSource::CreateImage(icon, badges);
+}
+
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_network.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698