[ash-md] Stacks child layers properly for sticky header rows

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 80 matching lines @@
 
 // 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)
       : parent_(parent) {
-    // TODO(varkha): Make this a sticky section header.
+    TrayPopupUtils::ConfigureAsStickyHeader(this);
     SetLayoutManager(new views::FillLayout);
     TriView* tri_view = TrayPopupUtils::CreateSubHeaderRowView();
     AddChildView(tri_view);
 
-    // Sets up the border. When the provider header is the first item in the
-    // list (i.e. when the list was empty before adding the provider row) there
-    // is already |kMenuSeparatorVerticalPadding| padding at the top of the
-    //  scroll contents, so only add that padding when the list was not |empty|.
-    // TODO(varkha): Delete this special handling when we allow the header to be
-    // sticky and just use ConfigureAsStickyHeader() instead.
-    tri_view->SetBorder(
-        views::CreateEmptyBorder(top_item ? 0 : kMenuSeparatorVerticalPadding,
-                                 0, kMenuSeparatorVerticalPadding, 0));
-
     views::Label* label = TrayPopupUtils::CreateDefaultLabel();
     TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::SUB_HEADER);
     style.SetupLabel(label);
     label->SetText(base::ASCIIToUTF16(name));
     tri_view->AddView(TriView::Container::CENTER, label);
 
     gfx::ImageSkia icon = gfx::CreateVectorIcon(kSystemMenuAddConnectionIcon,
                                                 style.GetIconColor());
     SystemMenuButton* add_vpn_button =
         new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED, icon,
@@ skipping 262 matching lines @@
         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);
 
-  if (!networks.empty() && IsConnectedOrConnecting(networks.front())) {
-    // If there is a connected or connecting network, show that network first.
-    AddNetwork(networks.front());
-    networks.erase(networks.begin());
-  }
-
   // Show all VPN providers and all networks that are currently disconnected.
   AddProvidersAndNetworks(networks);
 
   // Determine whether one of the new list entries corresponds to the entry that
   // the user was previously hovering over. If such an entry is found, the list
   // will be scrolled to ensure the entry is visible.
   const views::View* scroll_to_show_view = nullptr;
   if (hovered_provider_key) {
     for (const std::pair<const views::View* const, VPNProvider::Key>& provider :
          provider_view_key_map_) {
@@ skipping 110 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.key, provider.name, networks);
 }
 
 }  // namespace ash