[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..59f7695526fecd74e927e7de511a606cfbd586e7 100644
--- a/ash/common/system/chromeos/network/network_icon.cc
+++ b/ash/common/system/chromeos/network/network_icon.cc
@@ -928,12 +928,14 @@ base::string16 GetLabelForNetwork(const chromeos::NetworkState* network,
   std::string activation_state = network->activation_state();
   if (icon_type == ICON_TYPE_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.
     if (network->IsReconnecting()) {
       return l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_NETWORK_LIST_RECONNECTING,
           base::UTF8ToUTF16(network->name()));
     }
-    if (network->IsConnectingState()) {
+    if (!UseMd() && network->IsConnectingState()) {

[bruthig, 2016/12/20 20:26:01]

It appears that this code path is used during OOBE as well (see
NetworkDropdown::SetNetworkIconAndText()).  Was it a conscious decision to
remove the state from there as well?

[varkha, 2016/12/20 20:58:56]

Makes me wonder if it should use ICON_TYPE_DEFAULT_VIEW here - 
https://cs.chromium.org/chromium/src/chrome/browser/ui/webui/chromeos/login/n...

[varkha, 2016/12/20 21:41:09]

It looked like adding a value to the enum was simpler for now, considering
possible merge in M-56.

       return l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_NETWORK_LIST_CONNECTING,
           base::UTF8ToUTF16(network->name()));