[ash-md] Cleans up non-MD code path from VPN detailed page

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

[tdanderson, 2017/03/22 23:39:55]

note: I suggest that your other CL
https://chromiumcodereview.appspot.com/2768973002/ be landed first and merged
back to m-58 before this cleanup CL goes into ToT.

[varkha, 2017/03/23 01:22:12]

Makes sense. Will wait.

 // 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"
@@ skipping 17 matching lines @@
 #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"

[tdanderson, 2017/03/22 23:39:55]

nit: I think you can delete this now

[varkha, 2017/03/23 01:22:12]

Done.

 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
 namespace {
 
-bool UseMd() {
-  return MaterialDesignController::IsSystemTrayMenuMaterial();
-}
-
 // 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 &&
          network.third_party_vpn_provider_extension_id() ==
              provider.extension_id;
 }
 
 // The base class of all list entries, a |HoverHighlightView| with no border.
 class VPNListEntryBase : public HoverHighlightView {
  public:
   // When the user clicks the entry, the |parent|'s OnViewClicked() will be
   // invoked.
   explicit VPNListEntryBase(VPNListView* parent);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VPNListEntryBase);
 };
 
 // A list entry that represents a VPN provider.
-class VPNListProviderEntry : public VPNListEntryBase {
+class VPNListProviderEntry : public views::ButtonListener, public views::View {
  public:
-  VPNListProviderEntry(VPNListView* parent, const std::string& name)
-      : VPNListEntryBase(parent) {
-    views::Label* const label = AddLabel(
-        base::UTF8ToUTF16(name), gfx::ALIGN_LEFT, false /* highlight */);
-    label->SetBorder(views::CreateEmptyBorder(5, 0, 5, 0));
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(VPNListProviderEntry);
-};
-
-// A list entry that represents a VPN provider with Material Design.
-class VPNListProviderEntryMd : public views::ButtonListener,
-                               public views::View {
- public:
-  VPNListProviderEntryMd(ViewClickListener* parent,
-                         bool top_item,
-                         const std::string& name,
-                         int button_accessible_name_id)
+  VPNListProviderEntry(ViewClickListener* parent,
+                       bool top_item,
+                       const std::string& name,
+                       int button_accessible_name_id)
       : parent_(parent) {
     TrayPopupUtils::ConfigureAsStickyHeader(this);
     SetLayoutManager(new views::FillLayout);
     TriView* tri_view = TrayPopupUtils::CreateSubHeaderRowView();
     AddChildView(tri_view);
 
     views::Label* label = TrayPopupUtils::CreateDefaultLabel();
     TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::SUB_HEADER);
     style.SetupLabel(label);
     label->SetText(base::ASCIIToUTF16(name));
@@ skipping 14 matching lines @@
  protected:
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     parent_->OnViewClicked(this);
   }
 
  private:
   // Our parent to handle events.
   ViewClickListener* parent_;
 
-  DISALLOW_COPY_AND_ASSIGN(VPNListProviderEntryMd);
+  DISALLOW_COPY_AND_ASSIGN(VPNListProviderEntry);
 };
 
 // A list entry that represents a network. If the network is currently
 // connecting, the icon shown by this list entry will be animated. If the
 // network is currently connected, a disconnect button will be shown next to its
 // name.
 class VPNListNetworkEntry : public VPNListEntryBase,
                             public network_icon::AnimationObserver {
  public:
   VPNListNetworkEntry(VPNListView* parent,
                       const chromeos::NetworkState* network);
   ~VPNListNetworkEntry() override;
 
   // network_icon::AnimationObserver:
   void NetworkIconChanged() override;
 
  private:
   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);
+  void SetupConnectedItem(const base::string16& text,
+                          const gfx::ImageSkia& image);
+  void SetupConnectingItem(const base::string16& text,
+                           const gfx::ImageSkia& image);
 
   const std::string guid_;
 
   views::LabelButton* disconnect_button_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(VPNListNetworkEntry);
 };
 
 VPNListEntryBase::VPNListEntryBase(VPNListView* parent)
-    : HoverHighlightView(parent) {
-  if (!UseMd())
-    SetBorder(views::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 0));
-}
+    : HoverHighlightView(parent) {}
 
 VPNListNetworkEntry::VPNListNetworkEntry(VPNListView* parent,
                                          const chromeos::NetworkState* network)
     : VPNListEntryBase(parent), guid_(network->guid()) {
   UpdateFromNetworkState(network);
 }
 
 VPNListNetworkEntry::~VPNListNetworkEntry() {
   network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
 }
@@ skipping 15 matching lines @@
     // 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);
+      network, network_icon::ICON_TYPE_MENU_LIST);
   if (network->IsConnectedState())
-    SetupConnectedItemMd(label, image);
+    SetupConnectedItem(label, image);
   else if (network->IsConnectingState())
-    SetupConnectingItemMd(label, image);
+    SetupConnectingItem(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));
   }
   Layout();
 }
 
 // TODO(varkha): Consolidate with a similar method in tray_bluetooth.cc.
-void VPNListNetworkEntry::SetupConnectedItemMd(const base::string16& text,
-                                               const gfx::ImageSkia& image) {
+void VPNListNetworkEntry::SetupConnectedItem(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());
 }
 
 // TODO(varkha): Consolidate with a similar method in tray_bluetooth.cc.
-void VPNListNetworkEntry::SetupConnectingItemMd(const base::string16& text,
-                                                const gfx::ImageSkia& image) {
+void VPNListNetworkEntry::SetupConnectingItem(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
 
@@ skipping 25 matching lines @@
         break;
       }
     }
   }
 
   // Clear the list.
   container()->RemoveAllChildViews(true);
   provider_view_map_.clear();
   network_view_guid_map_.clear();
   list_empty_ = true;
-  if (!UseMd()) {
-    container()->SetLayoutManager(
-        new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
-  }
 
   // Get the list of available VPN networks, in shill's priority order.
   chromeos::NetworkStateHandler::NetworkStateList networks;
   chromeos::NetworkHandler::Get()
       ->network_state_handler()
       ->GetVisibleNetworkListByType(chromeos::NetworkTypePattern::VPN(),
                                     &networks);
 
   // Show all VPN providers and all networks that are currently disconnected.
   AddProvidersAndNetworks(networks);
@@ skipping 81 matching lines @@
   // Add a visual separator, unless this is the topmost entry in the list.
   if (!list_empty_)
     container()->AddChildView(TrayPopupUtils::CreateListSubHeaderSeparator());
   std::string vpn_name =
       vpn_provider.third_party
           ? vpn_provider.third_party_provider_name
           : l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_VPN_BUILT_IN_PROVIDER);
 
   // Add a list entry for the VPN provider.
   views::View* provider_view = nullptr;
-  if (UseMd()) {
-    provider_view = new VPNListProviderEntryMd(
-        this, list_empty_, vpn_name, IDS_ASH_STATUS_TRAY_ADD_CONNECTION);
-  } else {
-    provider_view = new VPNListProviderEntry(this, vpn_name);
-  }
+  provider_view = new VPNListProviderEntry(this, list_empty_, vpn_name,
+                                           IDS_ASH_STATUS_TRAY_ADD_CONNECTION);
   container()->AddChildView(provider_view);
   provider_view_map_[provider_view] = vpn_provider;
   list_empty_ = false;
   // Add the networks belonging to this provider, in the priority order returned
   // by shill.
   for (const chromeos::NetworkState* const& network : networks) {
     if (VpnProviderMatchesNetwork(vpn_provider, *network))
       AddNetwork(network);
   }
 }
@@ skipping 18 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