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

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

Issue 2597313002: [ash-md] Removes "Connecting..." suffix from the network and VPN detailed pages rows (Closed)
Patch Set: 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 d42f02e7e15ddf9ff63dc350f5ce64ea86d0efcd..3ef74f2c07f53c739631dabca9315dd056ab1a5a 100644
--- a/ash/common/system/chromeos/network/network_icon.h
+++ b/ash/common/system/chromeos/network/network_icon.h
@@ -24,7 +24,8 @@ class AnimationObserver;
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
@@ -50,7 +51,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