[ash-md] Removes "Connecting..." suffix from the network / VPN rows

ash/common/system/chromeos/network/network_icon.cc

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 fbd1b33a7d6395a034727bd90b55565bb46c2540..73998191f798f0cb0935917ab7007446c4722868 100644
--- a/ash/common/system/chromeos/network/network_icon.cc
+++ b/ash/common/system/chromeos/network/network_icon.cc
@@ -200,7 +200,7 @@ bool IconTypeIsDark(IconType icon_type) {
 }
 
 bool IconTypeHasVPNBadge(IconType icon_type) {
-  return (icon_type != ICON_TYPE_LIST);
+  return (icon_type != ICON_TYPE_LIST && icon_type != ICON_TYPE_MENU_LIST);
 }
 
 // This defines how we assemble a network icon.
@@ -926,14 +926,17 @@ base::string16 GetLabelForNetwork(const chromeos::NetworkState* network,
                                   IconType icon_type) {
   DCHECK(network);
   std::string activation_state = network->activation_state();
-  if (icon_type == ICON_TYPE_LIST) {
+  if (icon_type == ICON_TYPE_LIST || icon_type == ICON_TYPE_MENU_LIST) {
     // Show "<network>: [Connecting|Activating|Reconnecting]..."
+    // TODO(varkha): Remaining states should migrate to secondary status in the
+    // network item and no longer be part of the label.
+    // See http://crbug.com/676181 .
     if (network->IsReconnecting()) {
       return l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_NETWORK_LIST_RECONNECTING,

[sadrul, 2016/12/21 02:05:54]

We want to still show "Reconnecting..."?

[varkha, 2016/12/21 04:36:49]

For now yes, this is what the mentioned bug is about. It is not too bad since
the secondary status is not shown for that case so we will show "<network>:
Reconnecting" as the main string and there will be no secondary status.

           base::UTF8ToUTF16(network->name()));
     }
-    if (network->IsConnectingState()) {
+    if (icon_type != ICON_TYPE_MENU_LIST && network->IsConnectingState()) {
       return l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_NETWORK_LIST_CONNECTING,
           base::UTF8ToUTF16(network->name()));
@@ -1089,6 +1092,7 @@ void PurgeNetworkIconCache() {
   PurgeIconMap(ICON_TYPE_TRAY, network_paths);
   PurgeIconMap(ICON_TYPE_DEFAULT_VIEW, network_paths);
   PurgeIconMap(ICON_TYPE_LIST, network_paths);
+  PurgeIconMap(ICON_TYPE_MENU_LIST, network_paths);
 }
 
 }  // namespace network_icon