[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 182 matching lines @@
 
 SkColor GetDefaultColorForIconType(IconType icon_type) {
   return icon_type == ICON_TYPE_TRAY ? kTrayIconColor : kMenuIconColor;
 }
 
 bool IconTypeIsDark(IconType icon_type) {
   return (icon_type != ICON_TYPE_TRAY);
 }
 
 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.
 class NetworkIconImageSource : public gfx::CanvasImageSource {
  public:
   NetworkIconImageSource(const gfx::ImageSkia& icon, const Badges& badges)
       : CanvasImageSource(icon.size(), false), icon_(icon), badges_(badges) {}
   ~NetworkIconImageSource() override {}
 
   // TODO(pkotwicz): Figure out what to do when a new image resolution becomes
@@ skipping 705 matching lines @@
              ? gfx::CreateVectorIcon(kNetworkVpnIcon,
                                      GetDefaultColorForIconType(ICON_TYPE_LIST))
              : *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) {
+  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()));
     }
     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 135 matching lines @@
   NetworkHandler::Get()->network_state_handler()->GetVisibleNetworkList(
       &networks);
   std::set<std::string> network_paths;
   for (NetworkStateHandler::NetworkStateList::iterator iter = networks.begin();
        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);
+  PurgeIconMap(ICON_TYPE_MENU_LIST, network_paths);
 }
 
 }  // namespace network_icon
 }  // namespace ash