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

Unified Diff: chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_controller_unittest.cc

Issue 2603463002: Adds background fade in animation and exit label to touch calibrator view (Closed)
Patch Set: Resolving comments Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_controller_unittest.cc
diff --git a/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_controller_unittest.cc b/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_controller_unittest.cc
index d5627a57d3297d90d6df1a570272c96f87878b48..4ac1ea63877a560bdea5dce71084640d69bc237d 100644
--- a/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_controller_unittest.cc
+++ b/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_controller_unittest.cc
@@ -55,7 +55,13 @@ class TouchCalibratorControllerTest : public ash::test::AshTestBase {
TouchCalibratorView* target_calibrator_view =
ctrl->touch_calibrator_views_[target_display.id()].get();
- EXPECT_EQ(target_calibrator_view->state(), TouchCalibratorView::UNKNOWN);
+ // End the background fade in animation.
+ target_calibrator_view->SkipCurrentAnimationForTest();
+
+ // TouchCalibratorView on the display being calibrated should be at the
+ // state where the first display point is visible.
+ EXPECT_EQ(target_calibrator_view->state(),
+ TouchCalibratorView::DISPLAY_POINT_1);
}
private:
« no previous file with comments | « no previous file | chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698