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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/chromeos/network/network_icon.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/chromeos/network/network_icon_animation.h"
 #include "ash/common/system/chromeos/network/network_icon_animation_observer.h"
 #include "ash/common/system/tray/tray_constants.h"
@@ skipping 910 matching lines @@
              : *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
                    IDR_AURA_UBER_TRAY_NETWORK_VPN);
 }
 
 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) {
     // 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()));
     }
     if (activation_state == shill::kActivationStateActivating) {
       return l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_NETWORK_LIST_ACTIVATING,
           base::UTF8ToUTF16(network->name()));
     }
     // Show "Activate <network>" in list view only.
@@ skipping 139 matching lines @@
        iter != networks.end(); ++iter) {
     network_paths.insert((*iter)->path());
   }
   PurgeIconMap(ICON_TYPE_TRAY, network_paths);
   PurgeIconMap(ICON_TYPE_DEFAULT_VIEW, network_paths);
   PurgeIconMap(ICON_TYPE_LIST, network_paths);
 }
 
 }  // namespace network_icon
 }  // namespace ash