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

ash/common/system/tray/tray_details_view_unittest.cc

 // Copyright 2013 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_details_view.h"
 
+#include "ash/common/ash_view_ids.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/special_popup_row.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
 #include "ash/common/system/tray/view_click_listener.h"
 #include "ash/test/ash_test_base.h"
 #include "base/run_loop.h"
@@ skipping 36 matching lines @@
 
     tray_popup_header_button_ =
         new TrayPopupHeaderButton(this, IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED,
                                   IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED,
                                   IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER,
                                   IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER,
                                   IDS_ASH_STATUS_TRAY_BLUETOOTH);
     title_row()->AddViewToRowNonMd(tray_popup_header_button_, true);
   }
 
+  void CreateScrollerViews() { CreateScrollableList(); }
+
  private:
   TrayPopupHeaderButton* tray_popup_header_button_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDetailsView);
 };
 
 // Trivial item implementation that tracks its views for testing.
 class TestItem : public SystemTrayItem {
  public:
   TestItem()
@@ skipping 232 matching lines @@
 
   ui::test::EventGenerator& generator = GetEventGenerator();
   gfx::Rect bounds = button->GetBoundsInScreen();
   gfx::Point initial_point(bounds.x() - 1, bounds.y());
   generator.set_current_location(initial_point);
   generator.MoveMouseBy(1, 0);
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(button->background());
 }
 
+TEST_F(TrayDetailsViewTest, ScrollContentsTest) {
+  SystemTray* tray = GetPrimarySystemTray();
+  TestItem* test_item = new TestItem;
+  tray->AddTrayItem(test_item);
+  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
+  RunAllPendingInMessageLoop();
+  tray->ShowDetailedView(test_item, 0, true, BUBBLE_USE_EXISTING);
+  RunAllPendingInMessageLoop();
+  test_item->detailed_view()->CreateScrollerViews();
+
+  test_item->detailed_view()->scroll_content()->SetPaintToLayer(true);
+  views::View* view1 = new views::View();
+  test_item->detailed_view()->scroll_content()->AddChildView(view1);
+  views::View* view2 = new views::View();
+  view2->SetPaintToLayer(true);
+  test_item->detailed_view()->scroll_content()->AddChildView(view2);
+  views::View* view3 = new views::View();
+  view3->SetPaintToLayer(true);
+  test_item->detailed_view()->scroll_content()->AddChildView(view3);
+
+  // Child layers should have same order as the child views.
+  const std::vector<ui::Layer*>& layers =
+      test_item->detailed_view()->scroll_content()->layer()->children();
+  EXPECT_EQ(2u, layers.size());
+  EXPECT_EQ(view2->layer(), layers[0]);
+  EXPECT_EQ(view3->layer(), layers[1]);
+
+  // Mark |view2| as sticky and add one more child (which will reorder layers).
+  view2->set_id(VIEW_ID_STICKY_HEADER);
+  views::View* view4 = new views::View();
+  view4->SetPaintToLayer(true);
+  test_item->detailed_view()->scroll_content()->AddChildView(view4);
+
+  // Sticky header layer should be above the last child's layer.
+  EXPECT_EQ(3u, layers.size());
+  EXPECT_EQ(view3->layer(), layers[0]);
+  EXPECT_EQ(view4->layer(), layers[1]);
+  EXPECT_EQ(view2->layer(), layers[2]);
+}
+
 }  // namespace test
 }  // namespace ash