[ash-md] Makes Wi-Fi header row sticky when network list is scrolled

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

Index: ash/common/system/chromeos/network/network_list_md.cc
diff --git a/ash/common/system/chromeos/network/network_list_md.cc b/ash/common/system/chromeos/network/network_list_md.cc
index c5a5bfbb4cdda6c4bfd8d277d733274f08e20412..da1e8c5048453fc55b2010edeb5b72fe08c427f6 100644
--- a/ash/common/system/chromeos/network/network_list_md.cc
+++ b/ash/common/system/chromeos/network/network_list_md.cc
@@ -10,7 +10,9 @@
 #include "ash/common/system/chromeos/network/network_icon_animation.h"
 #include "ash/common/system/chromeos/network/network_info.h"
 #include "ash/common/system/chromeos/network/network_list_delegate.h"
+#include "ash/common/system/tray/tray_constants.h"
 #include "base/memory/ptr_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
 #include "chromeos/dbus/power_manager_client.h"
@@ -27,6 +29,7 @@
 #include "ui/gfx/font.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
+#include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/toggle_button.h"
@@ -46,16 +49,14 @@ namespace ash {
 
 namespace {
 
+const int kHeaderRowId = -1;
 const int kWiFiButtonSize = 48;
 const int kWifiRowVerticalInset = 4;
 const int kWifiRowLeftInset = 18;
 const int kWifiRowRightInset = 14;
-const int kWifiRowSeparatorThickness = 1;
 const int kWifiRowChildSpacing = 14;
 const int kFocusBorderInset = 1;
 
-const SkColor kWifiRowSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F);
-
 bool IsProhibitedByPolicy(const chromeos::NetworkState* network) {
   if (!NetworkTypePattern::WiFi().MatchesType(network->type()))
     return false;
@@ -116,11 +117,13 @@ class NetworkListViewMd::WifiHeaderRowView : public views::View {
     return GetPreferredSize().height();
   }
 
+  const char* GetClassName() const override { return "WifiHeaderRowView"; }
+
  private:
   void Init() {
+    set_id(kHeaderRowId);
+    set_background(views::Background::CreateSolidBackground(kBackgroundColor));
     // TODO(tdanderson): Need to unify this with the generic menu row class.
-    SetBorder(views::Border::CreateSolidSidedBorder(
-        kWifiRowSeparatorThickness, 0, 0, 0, kWifiRowSeparatorColor));
     views::View* container = new views::View;
     container->SetBorder(views::Border::CreateEmptyBorder(
         0, kWifiRowLeftInset, 0, kWifiRowRightInset));
@@ -433,6 +436,13 @@ void NetworkListViewMd::UpdateNetworkChild(int index, const NetworkInfo* info) {
     network_view->Layout();
     network_view->SchedulePaint();
   }
+  if (info->label == base::UTF8ToUTF16("wifi15") ||

[Evan Stade, 2016/11/02 13:41:27]

I assume this is for debugging

[varkha, 2016/11/02 22:42:34]

Yes, to be removed just before landing.

+      info->label == base::UTF8ToUTF16("wifi12") ||
+      info->label == base::UTF8ToUTF16("wifi20")) {
+    network_view->set_id(kHeaderRowId);
+    network_view->set_background(
+        views::Background::CreateSolidBackground(kBackgroundColor));
+  }
   PlaceViewAtIndex(network_view, index);
   if (info->disable)
     network_view->SetEnabled(false);