[ash-md] Adds VPN network status indicators in system menu

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

 // Copyright 2015 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/vpn_list_view.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "ash/common/ash_view_ids.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/chromeos/network/network_icon.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/chromeos/network/network_list_delegate.h"
 #include "ash/common/system/chromeos/network/vpn_list.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_menu_button.h"
 #include "ash/common/system/tray/system_tray_controller.h"
+#include "ash/common/system/tray/throbber_view.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/common/system/tray/tri_view.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 155 matching lines @@
     void OnMouseEntered(const ui::MouseEvent& event) override;
     void OnMouseExited(const ui::MouseEvent& event) override;
     void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
 
     VPNListNetworkEntry* parent_;
 
     DISALLOW_COPY_AND_ASSIGN(DisconnectButton);
   };
 
   void UpdateFromNetworkState(const chromeos::NetworkState* network);
+  void SetupConnectedItemMd(const base::string16& text,
+                            const gfx::ImageSkia& image);
+  void SetupConnectingItemMd(const base::string16& text,
+                             const gfx::ImageSkia& image);
 
   const std::string service_path_;
 
   views::LabelButton* disconnect_button_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(VPNListNetworkEntry);
 };
 
 VPNListEntryBase::VPNListEntryBase(VPNListView* parent)
     : HoverHighlightView(parent) {
@@ skipping 69 matching lines @@
   if (network && network->IsConnectingState())
     network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
   else
     network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
 
   if (!network) {
     // This is a transient state where the network has been removed already but
     // the network list in the UI has not been updated yet.
     return;
   }
-
   RemoveAllChildViews(true);
   disconnect_button_ = nullptr;
 
-  AddIconAndLabel(
-      network_icon::GetImageForNetwork(network, network_icon::ICON_TYPE_LIST),
-      network_icon::GetLabelForNetwork(network, network_icon::ICON_TYPE_LIST),
-      IsConnectedOrConnecting(network));
-  if (IsConnectedOrConnecting(network)) {
-    if (UseMd()) {
+  gfx::ImageSkia image =
+      network_icon::GetImageForNetwork(network, network_icon::ICON_TYPE_LIST);
+  base::string16 label =
+      network_icon::GetLabelForNetwork(network, network_icon::ICON_TYPE_LIST);
+  if (UseMd()) {
+    if (network->IsConnectedState())
+      SetupConnectedItemMd(label, image);
+    else if (network->IsConnectingState())
+      SetupConnectingItemMd(label, image);
+    else
+      AddIconAndLabel(image, label, IsConnectedOrConnecting(network));

[tdanderson, 2016/12/14 00:24:23]

nit: you can just pass in false for the third argument here since MD never
highlights any rows.

[varkha, 2016/12/14 17:01:47]

Done.

+
+    if (network->IsConnectedState()) {
       disconnect_button_ = TrayPopupUtils::CreateTrayPopupButton(
           this, l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_VPN_DISCONNECT));
       tri_view()->AddView(TriView::Container::END, disconnect_button_);
       tri_view()->SetContainerVisible(TriView::Container::END, true);
       tri_view()->SetContainerBorder(
           TriView::Container::END,
           views::CreateEmptyBorder(0, 0, 0, kTrayPopupButtonEndMargin));
-    } else {
+    }
+  } else {
+    AddIconAndLabel(image, label, IsConnectedOrConnecting(network));
+    if (IsConnectedOrConnecting(network)) {
       disconnect_button_ = new DisconnectButton(this);
       AddChildView(disconnect_button_);
       SetBorder(views::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 3));
+    } else {
+      SetBorder(views::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 0));
     }
-  } else {
-    if (!UseMd())
-      SetBorder(views::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 0));
-  }
-
-  if (!UseMd()) {
     // The icon and the disconnect button are always set to their preferred
     // size. All remaining space is used for the network name.
     views::BoxLayout* layout = new views::BoxLayout(
         views::BoxLayout::kHorizontal, 0, 3, kTrayPopupPaddingBetweenItems);
     SetLayoutManager(layout);
     layout->SetDefaultFlex(0);
     layout->SetFlexForView(text_label(), 1);
   }
   Layout();
 }
 
+// TODO(varkha): Consolidate with a similar method in tray_bluetooth.cc.
+void VPNListNetworkEntry::SetupConnectedItemMd(const base::string16& text,
+                                               const gfx::ImageSkia& image) {
+  AddIconAndLabels(
+      image, text,
+      l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CONNECTED));
+  TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::CAPTION);
+  style.set_color_style(TrayPopupItemStyle::ColorStyle::CONNECTED);
+  style.SetupLabel(sub_text_label());

[tdanderson, 2016/12/14 00:24:23]

Wouldn't you also need to set the "connecting..." label to have a CAPTION style,
too? If so then we should probably be doing the same thing in the Bluetooth
version of this file too (in a separate CL though).

[varkha, 2016/12/14 17:01:47]

I think code here does that, no?
https://cs.chromium.org/chromium/src/ash/common/system/tray/hover_highlight_v...

+}
+
+// TODO(varkha): Consolidate with a similar method in tray_bluetooth.cc.
+void VPNListNetworkEntry::SetupConnectingItemMd(const base::string16& text,
+                                                const gfx::ImageSkia& image) {
+  AddIconAndLabels(
+      image, text,
+      l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CONNECTING));
+  ThrobberView* throbber = new ThrobberView;
+  throbber->Start();
+  AddRightView(throbber);
+}
+
 }  // namespace
 
 VPNListView::VPNListView(NetworkListDelegate* delegate) : delegate_(delegate) {
   WmShell::Get()->vpn_list()->AddObserver(this);
 }
 
 VPNListView::~VPNListView() {
   WmShell::Get()->vpn_list()->RemoveObserver(this);
 }
 
@@ skipping 172 matching lines @@
     }
   }
 
   // Add providers without any configured networks, in the order that the
   // providers were returned by the extensions system.
   for (const VPNProvider& provider : providers)
     AddProviderAndNetworks(provider, networks);
 }
 
 }  // namespace ash