| 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);
|
|
|