[Chrome OS MD] Update Cast and VPN to follow MD layout

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>
 
@@ skipping 179 matching lines @@
 
   const std::string service_path_;
 
   views::LabelButton* disconnect_button_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(VPNListNetworkEntry);
 };
 
 VPNListEntryBase::VPNListEntryBase(VPNListView* parent)
     : HoverHighlightView(parent) {
-  SetBorder(views::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 0));
+  if (!UseMd())
+    SetBorder(views::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 0));
 }
 
 VPNListNetworkEntry::VPNListNetworkEntry(VPNListView* parent,
                                          const chromeos::NetworkState* network)
     : VPNListEntryBase(parent), service_path_(network->path()) {
   UpdateFromNetworkState(network);
 }
 
 VPNListNetworkEntry::~VPNListNetworkEntry() {
   network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
@@ skipping 69 matching lines @@
   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()) {
       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 {
       disconnect_button_ = new DisconnectButton(this);
+      AddChildView(disconnect_button_);
+      SetBorder(views::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 3));
     }
-    if (UseMd()) {
-      DCHECK(tri_view());
-      tri_view()->AddView(TriView::Container::END, disconnect_button_);
-      tri_view()->SetContainerVisible(TriView::Container::END, true);
-    } else {
-      AddChildView(disconnect_button_);
-    }
-
-    SetBorder(
-        views::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0,
-                                 UseMd() ? kTrayPopupButtonEndMargin : 3));
   } else {
-    SetBorder(views::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 0));
+    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);
@@ skipping 191 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