Remove TrayPopupLabelButton (a pre-MD class) and its assets.

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"
 #include "base/values.h"
 #include "chromeos/network/network_connection_handler.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_type_pattern.h"
 #include "grit/ash_strings.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/button.h"
+#include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
 namespace {
 
 bool UseMd() {
   return MaterialDesignController::IsSystemTrayMenuMaterial();
 }
 
-bool IsConnectedOrConnecting(const chromeos::NetworkState* network) {
-  return network->IsConnectedState() || network->IsConnectingState();
-}
-
-void IgnoreDisconnectError(const std::string& error_name,
-                           std::unique_ptr<base::DictionaryValue> error_data) {}
-
 // Indicates whether |network| belongs to this VPN provider.
 bool VpnProviderMatchesNetwork(const VPNProvider& provider,
                                const chromeos::NetworkState& network) {
   if (network.type() != shill::kTypeVPN)
     return false;
   const bool network_uses_third_party_provider =
       network.vpn_provider_type() == shill::kProviderThirdPartyVpn;
   if (!provider.third_party)
     return !network_uses_third_party_provider;
   return network_uses_third_party_provider &&
@@ skipping 78 matching lines @@
 class VPNListNetworkEntry : public VPNListEntryBase,
                             public network_icon::AnimationObserver {
  public:
   VPNListNetworkEntry(VPNListView* parent,
                       const chromeos::NetworkState* network);
   ~VPNListNetworkEntry() override;
 
   // network_icon::AnimationObserver:
   void NetworkIconChanged() override;
 
-  // Overriden from ActionableView.
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
  private:
-  // A disconnect button that will be shown if the network is currently
-  // connected. Updates the list entry's hover state as the mouse enters/exits
-  // the button.
-  class DisconnectButton : public TrayPopupLabelButton {
-   public:
-    explicit DisconnectButton(VPNListNetworkEntry* parent);
-
-   private:
-    // TrayPopupLabelButton:
-    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;
 
@@ skipping 15 matching lines @@
 VPNListNetworkEntry::~VPNListNetworkEntry() {
   network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
 }
 
 void VPNListNetworkEntry::NetworkIconChanged() {
   UpdateFromNetworkState(
       chromeos::NetworkHandler::Get()->network_state_handler()->GetNetworkState(
           service_path_));
 }
 
-void VPNListNetworkEntry::ButtonPressed(views::Button* sender,
-                                        const ui::Event& event) {
-  if (sender != disconnect_button_) {
-    ActionableView::ButtonPressed(sender, event);
-    return;
-  }
-
-  WmShell::Get()->RecordUserMetricsAction(
-      UMA_STATUS_AREA_VPN_DISCONNECT_CLICKED);
-  chromeos::NetworkHandler::Get()
-      ->network_connection_handler()
-      ->DisconnectNetwork(service_path_, base::Bind(&base::DoNothing),
-                          base::Bind(&IgnoreDisconnectError));
-}
-
-VPNListNetworkEntry::DisconnectButton::DisconnectButton(
-    VPNListNetworkEntry* parent)
-    : TrayPopupLabelButton(
-          parent,
-          l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_VPN_DISCONNECT)),
-      parent_(parent) {
-  DCHECK(!UseMd());
-  DCHECK(parent_);
-}
-
-void VPNListNetworkEntry::DisconnectButton::OnMouseEntered(
-    const ui::MouseEvent& event) {
-  TrayPopupLabelButton::OnMouseEntered(event);
-  parent_->SetHoverHighlight(false);
-}
-
-void VPNListNetworkEntry::DisconnectButton::OnMouseExited(
-    const ui::MouseEvent& event) {
-  TrayPopupLabelButton::OnMouseExited(event);
-  if (parent_->IsMouseHovered())
-    parent_->SetHoverHighlight(true);
-}
-
-void VPNListNetworkEntry::DisconnectButton::OnBoundsChanged(
-    const gfx::Rect& previous_bounds) {
-  TrayPopupLabelButton::OnBoundsChanged(previous_bounds);
-  if (IsMouseHovered()) {
-    SetState(STATE_HOVERED);
-    parent_->SetHoverHighlight(false);
-  }
-}
-
 void VPNListNetworkEntry::UpdateFromNetworkState(
     const chromeos::NetworkState* network) {
   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;
 
   gfx::ImageSkia image =
       network_icon::GetImageForNetwork(network, network_icon::ICON_TYPE_LIST);
   base::string16 label = network_icon::GetLabelForNetwork(
       network, UseMd() ? network_icon::ICON_TYPE_MENU_LIST
                        : network_icon::ICON_TYPE_LIST);
   if (UseMd()) {

[tdanderson, 2017/02/08 00:39:37]

Remove this line and un-indent all lines within block

[Evan Stade, 2017/02/08 01:00:20]

Done.

     if (network->IsConnectedState())
       SetupConnectedItemMd(label, image);
     else if (network->IsConnectingState())
       SetupConnectingItemMd(label, image);
     else
       AddIconAndLabel(image, label, false);
 
     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 {
-    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));
-    }
-    // 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));
@@ skipping 192 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