Fix a couple issues with sticky headers

ash/common/system/tray/tray_popup_utils.cc

 // Copyright 2016 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/tray/tray_popup_utils.h"
 
 #include "ash/common/ash_constants.h"
+#include "ash/common/ash_view_ids.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/fixed_sized_image_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_label_button_border.h"
 #include "ash/common/wm_shell.h"
 #include "ui/views/animation/ink_drop_impl.h"
+#include "ui/views/background.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/button/md_text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/slider.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
@@ skipping 157 matching lines @@
   if (is_material) {
     slider->SetBorder(
         views::CreateEmptyBorder(gfx::Insets(0, kTrayPopupSliderPaddingMD)));
   } else {
     slider->SetBorder(
         views::CreateEmptyBorder(0, 0, 0, kTrayPopupPaddingBetweenItems));
   }
   return slider;
 }
 
+void TrayPopupUtils::ConfigureAsStickyHeader(views::View* view) {
+  view->set_id(VIEW_ID_STICKY_HEADER);
+  view->set_background(
+      views::Background::CreateSolidBackground(kBackgroundColor));
+  view->SetBorder(
+      views::CreateEmptyBorder(gfx::Insets(kMenuSeparatorVerticalPadding, 0)));
+}
+
 void TrayPopupUtils::ConfigureContainer(TriView::Container container,
                                         views::View* container_view) {
   container_view->SetBorder(CreateDefaultBorder(container));
   container_view->SetLayoutManager(
       CreateDefaultLayoutManager(container).release());
 }
 
 void TrayPopupUtils::ConfigureDefaultSizeAndFlex(TriView* tri_view,
                                                  TriView::Container container) {
   switch (container) {
@@ skipping 77 matching lines @@
           0, GetTrayConstant(TRAY_POPUP_ITEM_MORE_REGION_HORIZONTAL_INSET), 0,
           GetTrayConstant(TRAY_POPUP_ITEM_MORE_REGION_HORIZONTAL_INSET));
       break;
   }
   // Required by some compilers.
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace ash