OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/metrics/pointer_metrics_recorder.h" | 5 #include "ash/metrics/pointer_metrics_recorder.h" |
6 | 6 |
7 #include "ash/public/cpp/shell_window_ids.h" | 7 #include "ash/public/cpp/shell_window_ids.h" |
8 #include "ash/shared/app_types.h" | 8 #include "ash/shared/app_types.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
11 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 11 #include "ash/wm/tablet_mode/tablet_mode_controller.h" |
12 #include "ash/wm_window.h" | 12 #include "ash/wm_window.h" |
13 #include "base/test/histogram_tester.h" | 13 #include "base/test/histogram_tester.h" |
14 #include "ui/events/event.h" | 14 #include "ui/events/event.h" |
15 #include "ui/views/pointer_watcher.h" | 15 #include "ui/views/pointer_watcher.h" |
16 #include "ui/views/widget/widget.h" | 16 #include "ui/views/widget/widget.h" |
17 | 17 |
18 using views::PointerWatcher; | 18 using views::PointerWatcher; |
19 | 19 |
20 namespace ash { | 20 namespace ash { |
21 namespace { | 21 namespace { |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 | 127 |
128 // Verifies that down events in different form factors are recorded. | 128 // Verifies that down events in different form factors are recorded. |
129 TEST_F(PointerMetricsRecorderTest, DownEventPerFormFactor) { | 129 TEST_F(PointerMetricsRecorderTest, DownEventPerFormFactor) { |
130 std::unique_ptr<views::Widget> target = | 130 std::unique_ptr<views::Widget> target = |
131 CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); | 131 CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
132 const ui::PointerEvent pointer_event( | 132 const ui::PointerEvent pointer_event( |
133 ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), 0, 0, | 133 ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), 0, 0, |
134 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE), | 134 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE), |
135 base::TimeTicks()); | 135 base::TimeTicks()); |
136 | 136 |
137 // Enable maximize mode | 137 // Enable tablet mode |
138 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager( | 138 Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(true); |
139 true); | |
140 pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(), | 139 pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(), |
141 target.get()); | 140 target.get()); |
142 histogram_tester_->ExpectBucketCount(kFormFactorHistogramName, 1, 1); | 141 histogram_tester_->ExpectBucketCount(kFormFactorHistogramName, 1, 1); |
143 | 142 |
144 // Disable maximize mode | 143 // Disable tablet mode |
145 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager( | 144 Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(false); |
146 false); | |
147 pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(), | 145 pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(), |
148 target.get()); | 146 target.get()); |
149 histogram_tester_->ExpectBucketCount(kFormFactorHistogramName, 0, 1); | 147 histogram_tester_->ExpectBucketCount(kFormFactorHistogramName, 0, 1); |
150 } | 148 } |
151 | 149 |
152 // Verifies that down events dispatched to different destinations are recorded. | 150 // Verifies that down events dispatched to different destinations are recorded. |
153 TEST_F(PointerMetricsRecorderTest, DownEventPerDestination) { | 151 TEST_F(PointerMetricsRecorderTest, DownEventPerDestination) { |
154 std::unique_ptr<views::Widget> target = | 152 std::unique_ptr<views::Widget> target = |
155 CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); | 153 CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
156 const ui::PointerEvent pointer_event( | 154 const ui::PointerEvent pointer_event( |
(...skipping 19 matching lines...) Expand all Loading... |
176 target.get()); | 174 target.get()); |
177 histogram_tester_->ExpectBucketCount(kDestinationHistogramName, 2, 1); | 175 histogram_tester_->ExpectBucketCount(kDestinationHistogramName, 2, 1); |
178 | 176 |
179 window->SetAppType(static_cast<int>(AppType::ARC_APP)); | 177 window->SetAppType(static_cast<int>(AppType::ARC_APP)); |
180 pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(), | 178 pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(), |
181 target.get()); | 179 target.get()); |
182 histogram_tester_->ExpectBucketCount(kDestinationHistogramName, 3, 1); | 180 histogram_tester_->ExpectBucketCount(kDestinationHistogramName, 3, 1); |
183 } | 181 } |
184 | 182 |
185 } // namespace ash | 183 } // namespace ash |
OLD | NEW |