Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Side by Side Diff: ash/metrics/pointer_metrics_recorder_unittest.cc

Issue 2909763002: Revert of Rename MaximizeMode to TabletMode (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/metrics/pointer_metrics_recorder.cc ('k') | ash/mojo_interface_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/tablet_mode/tablet_mode_controller.h" 11 #include "ash/wm/maximize_mode/maximize_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
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 tablet mode 137 // Enable maximize mode
138 Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(true); 138 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
139 true);
139 pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(), 140 pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(),
140 target.get()); 141 target.get());
141 histogram_tester_->ExpectBucketCount(kFormFactorHistogramName, 1, 1); 142 histogram_tester_->ExpectBucketCount(kFormFactorHistogramName, 1, 1);
142 143
143 // Disable tablet mode 144 // Disable maximize mode
144 Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(false); 145 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
146 false);
145 pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(), 147 pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(),
146 target.get()); 148 target.get());
147 histogram_tester_->ExpectBucketCount(kFormFactorHistogramName, 0, 1); 149 histogram_tester_->ExpectBucketCount(kFormFactorHistogramName, 0, 1);
148 } 150 }
149 151
150 // Verifies that down events dispatched to different destinations are recorded. 152 // Verifies that down events dispatched to different destinations are recorded.
151 TEST_F(PointerMetricsRecorderTest, DownEventPerDestination) { 153 TEST_F(PointerMetricsRecorderTest, DownEventPerDestination) {
152 std::unique_ptr<views::Widget> target = 154 std::unique_ptr<views::Widget> target =
153 CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); 155 CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
154 const ui::PointerEvent pointer_event( 156 const ui::PointerEvent pointer_event(
(...skipping 19 matching lines...) Expand all
174 target.get()); 176 target.get());
175 histogram_tester_->ExpectBucketCount(kDestinationHistogramName, 2, 1); 177 histogram_tester_->ExpectBucketCount(kDestinationHistogramName, 2, 1);
176 178
177 window->SetAppType(static_cast<int>(AppType::ARC_APP)); 179 window->SetAppType(static_cast<int>(AppType::ARC_APP));
178 pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(), 180 pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(),
179 target.get()); 181 target.get());
180 histogram_tester_->ExpectBucketCount(kDestinationHistogramName, 3, 1); 182 histogram_tester_->ExpectBucketCount(kDestinationHistogramName, 3, 1);
181 } 183 }
182 184
183 } // namespace ash 185 } // namespace ash
OLDNEW
« no previous file with comments | « ash/metrics/pointer_metrics_recorder.cc ('k') | ash/mojo_interface_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698