Reland of Make TrayDetailsView a ViewClickListener and ButtonListener

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/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_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"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace test {
 
 namespace {
 
-class TestDetailsView : public TrayDetailsView,
-                        public ViewClickListener,
-                        public views::ButtonListener {
+class TestDetailsView : public TrayDetailsView {
  public:
   explicit TestDetailsView(SystemTrayItem* owner) : TrayDetailsView(owner) {
     // Uses bluetooth label for testing purpose. It can be changed to any
     // string_id.
-    CreateSpecialRow(IDS_ASH_STATUS_TRAY_BLUETOOTH, this);
-    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);
-    footer()->AddButton(tray_popup_header_button_);
+    CreateTitleRow(IDS_ASH_STATUS_TRAY_BLUETOOTH);
   }
 
   ~TestDetailsView() override {}
 
   TrayPopupHeaderButton* tray_popup_header_button() {
     return tray_popup_header_button_;
   }
 
-  void FocusFooter() { footer()->content()->RequestFocus(); }
+  void FocusTitleRow() { title_row()->content()->RequestFocus(); }
 
-  // ViewClickListener:
-  void OnViewClicked(views::View* sender) override {}
+  // TrayDetailsView:
+  void CreateExtraTitleRowButtons() override {
+    // TODO(tdanderson): Add test coverage for material design buttons in the
+    // title row once they are implemented.
+    if (MaterialDesignController::IsSystemTrayMenuMaterial())
+      return;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override {}
+    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()->AddButton(tray_popup_header_button_);
+  }
 
  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:
@@ skipping 43 matching lines @@
   HoverHighlightView* CreateAndShowHoverHighlightView() {
     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();
 
     return static_cast<HoverHighlightView*>(
-        test_item->detailed_view()->footer()->content());
+        test_item->detailed_view()->title_row()->content());
   }
 
   TrayPopupHeaderButton* CreateAndShowTrayPopupHeaderButton() {
     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();
 
     return test_item->detailed_view()->tray_popup_header_button();
   }
 
+  void TransitionFromDetailedToDefaultView(TestDetailsView* detailed) {
+    detailed->TransitionToDefaultView();
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(TrayDetailsViewTest);
 };
 
 TEST_F(TrayDetailsViewTest, TransitionToDefaultViewTest) {
   SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   TestItem* test_item_1 = new TestItem;
   TestItem* test_item_2 = new TestItem;
   tray->AddTrayItem(test_item_1);
   tray->AddTrayItem(test_item_2);
 
   // Ensure the tray views are created.
   ASSERT_TRUE(test_item_1->tray_view() != NULL);
   ASSERT_TRUE(test_item_2->tray_view() != NULL);
 
   // Show the default view.
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   RunAllPendingInMessageLoop();
 
   // Show the detailed view of item 2.
   tray->ShowDetailedView(test_item_2, 0, true, BUBBLE_USE_EXISTING);
   EXPECT_TRUE(test_item_2->detailed_view());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(test_item_2->default_view());
 
   // Transition back to default view, the default view of item 2 should have
   // focus.
-  test_item_2->detailed_view()->FocusFooter();
-  test_item_2->detailed_view()->TransitionToDefaultView();
+  test_item_2->detailed_view()->FocusTitleRow();
+  TransitionFromDetailedToDefaultView(test_item_2->detailed_view());
   RunAllPendingInMessageLoop();
 
   EXPECT_TRUE(test_item_2->default_view());
   EXPECT_FALSE(test_item_2->detailed_view());
   EXPECT_TRUE(test_item_2->default_view()->HasFocus());
 
   // Show the detailed view of item 2 again.
   tray->ShowDetailedView(test_item_2, 0, true, BUBBLE_USE_EXISTING);
   EXPECT_TRUE(test_item_2->detailed_view());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(test_item_2->default_view());
 
   // Transition back to default view, the default view of item 2 should NOT have
   // focus.
-  test_item_2->detailed_view()->TransitionToDefaultView();
+  TransitionFromDetailedToDefaultView(test_item_2->detailed_view());
   RunAllPendingInMessageLoop();
 
   EXPECT_TRUE(test_item_2->default_view());
   EXPECT_FALSE(test_item_2->detailed_view());
   EXPECT_FALSE(test_item_2->default_view()->HasFocus());
 }
 
 // Tests that HoverHighlightView enters hover state in response to touch.
 TEST_F(TrayDetailsViewTest, HoverHighlightViewTouchFeedback) {
   HoverHighlightView* view = CreateAndShowHoverHighlightView();
   EXPECT_FALSE(view->hover());
 
   ui::test::EventGenerator& generator = GetEventGenerator();
   generator.set_current_location(view->GetBoundsInScreen().CenterPoint());
   generator.PressTouch();
   EXPECT_TRUE(view->hover());
 
   generator.ReleaseTouch();
-  EXPECT_FALSE(view->hover());

[tdanderson, 2016/09/02 15:47:00]

This is the only change from Patch Set 5 in
https://codereview.chromium.org/2289223002/. Releasing the touch triggers a tap
on the title row, which transitions back to the default view, so |view| has been
destroyed.

 }
 
 // Tests that touch events leaving HoverHighlightView cancel the hover state.
 TEST_F(TrayDetailsViewTest, HoverHighlightViewTouchFeedbackCancellation) {
   HoverHighlightView* view = CreateAndShowHoverHighlightView();
   EXPECT_FALSE(view->hover());
 
   gfx::Rect view_bounds = view->GetBoundsInScreen();
   ui::test::EventGenerator& generator = GetEventGenerator();
   generator.set_current_location(view_bounds.CenterPoint());
   generator.PressTouch();
   EXPECT_TRUE(view->hover());
 
   gfx::Point move_point(view_bounds.x(), view_bounds.CenterPoint().y());
   generator.MoveTouch(move_point);
   EXPECT_FALSE(view->hover());
 
   generator.set_current_location(move_point);
   generator.ReleaseTouch();
   EXPECT_FALSE(view->hover());
 }
 
 // Tests that TrayPopupHeaderButton renders a background in response to touch.
 TEST_F(TrayDetailsViewTest, TrayPopupHeaderButtonTouchFeedback) {
+  // Material design detailed views will not use TrayPopupHeaderButton.
+  if (MaterialDesignController::IsSystemTrayMenuMaterial())
+    return;
+
   TrayPopupHeaderButton* button = CreateAndShowTrayPopupHeaderButton();
   EXPECT_FALSE(button->background());
 
   ui::test::EventGenerator& generator = GetEventGenerator();
   generator.set_current_location(button->GetBoundsInScreen().CenterPoint());
   generator.PressTouch();
   EXPECT_TRUE(button->background());
 
   generator.ReleaseTouch();
   EXPECT_FALSE(button->background());
 }
 
 // Tests that touch events leaving TrayPopupHeaderButton cancel the touch
 // feedback background.
 TEST_F(TrayDetailsViewTest, TrayPopupHeaderButtonTouchFeedbackCancellation) {
+  // Material design detailed views will not use TrayPopupHeaderButton.
+  if (MaterialDesignController::IsSystemTrayMenuMaterial())
+    return;
+
   TrayPopupHeaderButton* button = CreateAndShowTrayPopupHeaderButton();
   EXPECT_FALSE(button->background());
 
   gfx::Rect view_bounds = button->GetBoundsInScreen();
   ui::test::EventGenerator& generator = GetEventGenerator();
   generator.set_current_location(view_bounds.CenterPoint());
   generator.PressTouch();
   EXPECT_TRUE(button->background());
 
   gfx::Point move_point(view_bounds.x(), view_bounds.CenterPoint().y());
   generator.MoveTouch(move_point);
   EXPECT_FALSE(button->background());
 
   generator.set_current_location(move_point);
   generator.ReleaseTouch();
   EXPECT_FALSE(button->background());
 }
 
 // Tests that a mouse entering TrayPopupHeaderButton renders a background as
 // visual feedback.
 TEST_F(TrayDetailsViewTest, TrayPopupHeaderButtonMouseHoverFeedback) {
+  // Material design detailed views will not use TrayPopupHeaderButton.
+  if (MaterialDesignController::IsSystemTrayMenuMaterial())
+    return;
+
   TrayPopupHeaderButton* button = CreateAndShowTrayPopupHeaderButton();
   EXPECT_FALSE(button->background());
 
   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());
 }
 
 }  // namespace test
 }  // namespace ash