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

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

Issue 2587133003: [ash-md] Removes "Connecting..." suffix from the network / VPN rows (Closed)
Patch Set: [ash-md] Removes 'Connecting...' suffix from the network row (nits) Created 4 years 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 | ash/common/system/chromeos/network/network_icon.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.h
diff --git a/ash/common/system/chromeos/network/network_icon.h b/ash/common/system/chromeos/network/network_icon.h
index 7d2e202b88e3b1429155bb36ae7e3014e4580ce4..d6a276c0ce09a20a7602c08e9e003bd794204e28 100644
--- a/ash/common/system/chromeos/network/network_icon.h
+++ b/ash/common/system/chromeos/network/network_icon.h
@@ -22,7 +22,8 @@ namespace network_icon {
enum IconType {
ICON_TYPE_TRAY, // light icons with VPN badges
ICON_TYPE_DEFAULT_VIEW, // dark icons with VPN badges
- ICON_TYPE_LIST, // dark icons without VPN badges
+ ICON_TYPE_LIST, // dark icons without VPN badges; in-line status
+ ICON_TYPE_MENU_LIST, // dark icons without VPN badges; separate status
};
// Gets the image for the network associated with |service_path|. |network| must
@@ -48,7 +49,8 @@ ASH_EXPORT gfx::ImageSkia GetImageForNewWifiNetwork(SkColor icon_color,
// Returns a vpn image suitable for use on a light background.
ASH_EXPORT gfx::ImageSkia GetVpnImage();
-// Returns the label for |network| based on |icon_type|. |network| can be NULL.
+// Returns the label for |network| based on |icon_type|. |network| cannot be
+// nullptr.
ASH_EXPORT base::string16 GetLabelForNetwork(
const chromeos::NetworkState* network,
IconType icon_type);
« no previous file with comments | « no previous file | ash/common/system/chromeos/network/network_icon.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698