| OLD | NEW | 
|    1 // Copyright 2015 The Chromium Authors. All rights reserved. |    1 // Copyright 2015 The Chromium Authors. All rights reserved. | 
|    2 // Use of this source code is governed by a BSD-style license that can be |    2 // Use of this source code is governed by a BSD-style license that can be | 
|    3 // found in the LICENSE file. |    3 // found in the LICENSE file. | 
|    4  |    4  | 
|    5 #include "ash/shelf/shelf_button_pressed_metric_tracker.h" |    5 #include "ash/shelf/shelf_button_pressed_metric_tracker.h" | 
|    6  |    6  | 
|    7 #include "ash/shelf/shelf.h" |    7 #include "ash/shelf/shelf.h" | 
|    8 #include "ash/test/ash_test_base.h" |    8 #include "ash/test/ash_test_base.h" | 
|    9 #include "ash/test/shelf_button_pressed_metric_tracker_test_api.h" |    9 #include "ash/test/shelf_button_pressed_metric_tracker_test_api.h" | 
|   10 #include "ash/test/shelf_test_api.h" |   10 #include "ash/test/shelf_test_api.h" | 
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  151   const DummyEvent kDummyEvent; |  151   const DummyEvent kDummyEvent; | 
|  152   metric_tracker_->ButtonPressed(kDummyEvent, sender, performed_action); |  152   metric_tracker_->ButtonPressed(kDummyEvent, sender, performed_action); | 
|  153 } |  153 } | 
|  154  |  154  | 
|  155 }  // namespace |  155 }  // namespace | 
|  156  |  156  | 
|  157 // Verifies that a Launcher_ButtonPressed_Mouse UMA user action is recorded when |  157 // Verifies that a Launcher_ButtonPressed_Mouse UMA user action is recorded when | 
|  158 // a button is pressed by a mouse event. |  158 // a button is pressed by a mouse event. | 
|  159 TEST_F(ShelfButtonPressedMetricTrackerTest, |  159 TEST_F(ShelfButtonPressedMetricTrackerTest, | 
|  160        Launcher_ButtonPressed_MouseIsRecordedWhenIconActivatedByMouse) { |  160        Launcher_ButtonPressed_MouseIsRecordedWhenIconActivatedByMouse) { | 
|  161   const ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(), |  161   const ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::PointF(), | 
|  162                                    gfx::Point(), base::TimeDelta(), 0, 0); |  162                                    gfx::PointF(), base::TimeDelta(), 0, 0); | 
|  163  |  163  | 
|  164   base::UserActionTester user_action_tester; |  164   base::UserActionTester user_action_tester; | 
|  165   ButtonPressed(mouse_event); |  165   ButtonPressed(mouse_event); | 
|  166   EXPECT_EQ(1, |  166   EXPECT_EQ(1, | 
|  167             user_action_tester.GetActionCount("Launcher_ButtonPressed_Mouse")); |  167             user_action_tester.GetActionCount("Launcher_ButtonPressed_Mouse")); | 
|  168 } |  168 } | 
|  169  |  169  | 
|  170 // Verifies that a Launcher_ButtonPressed_Touch UMA user action is recorded when |  170 // Verifies that a Launcher_ButtonPressed_Touch UMA user action is recorded when | 
|  171 // a button is pressed by a touch event. |  171 // a button is pressed by a touch event. | 
|  172 TEST_F(ShelfButtonPressedMetricTrackerTest, |  172 TEST_F(ShelfButtonPressedMetricTrackerTest, | 
|  173        Launcher_ButtonPressed_MouseIsRecordedWhenIconActivatedByTouch) { |  173        Launcher_ButtonPressed_MouseIsRecordedWhenIconActivatedByTouch) { | 
|  174   const ui::TouchEvent touch_event(ui::ET_GESTURE_TAP, gfx::Point(), 0, |  174   const ui::TouchEvent touch_event(ui::ET_GESTURE_TAP, gfx::PointF(), 0, | 
|  175                                    base::TimeDelta()); |  175                                    base::TimeDelta()); | 
|  176  |  176  | 
|  177   base::UserActionTester user_action_tester; |  177   base::UserActionTester user_action_tester; | 
|  178   ButtonPressed(touch_event); |  178   ButtonPressed(touch_event); | 
|  179   EXPECT_EQ(1, |  179   EXPECT_EQ(1, | 
|  180             user_action_tester.GetActionCount("Launcher_ButtonPressed_Touch")); |  180             user_action_tester.GetActionCount("Launcher_ButtonPressed_Touch")); | 
|  181 } |  181 } | 
|  182  |  182  | 
|  183 // Verifies that a Launcher_LaunchTask UMA user action is recorded when |  183 // Verifies that a Launcher_LaunchTask UMA user action is recorded when | 
|  184 // pressing a button causes a new window to be created. |  184 // pressing a button causes a new window to be created. | 
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  290  |  290  | 
|  291   histogram_tester.ExpectTotalCount( |  291   histogram_tester.ExpectTotalCount( | 
|  292       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, 1); |  292       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, 1); | 
|  293   histogram_tester.ExpectBucketCount( |  293   histogram_tester.ExpectBucketCount( | 
|  294       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, |  294       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, | 
|  295       kTimeDeltaInMilliseconds, 1); |  295       kTimeDeltaInMilliseconds, 1); | 
|  296 } |  296 } | 
|  297  |  297  | 
|  298 }  // namespace test |  298 }  // namespace test | 
|  299 }  // namespace ash |  299 }  // namespace ash | 
| OLD | NEW |