| Index: ash/touch/touch_transformer_controller.h
|
| diff --git a/ash/touch/touch_transformer_controller.h b/ash/touch/touch_transformer_controller.h
|
| index 640fcbb8c8f499de202b8db3080bafbbe691e33c..a821d5d64a7dc4fcad7a488dc345fd92495260b6 100644
|
| --- a/ash/touch/touch_transformer_controller.h
|
| +++ b/ash/touch/touch_transformer_controller.h
|
| @@ -35,6 +35,10 @@ class ASH_EXPORT TouchTransformerController
|
| void OnDisplaysInitialized() override;
|
| void OnDisplayConfigurationChanged() override;
|
|
|
| + // During touch calibration we remove any kind of transform that is being
|
| + // applied to the touch input's location.
|
| + void SetForCalibration(bool is_calibrating);
|
| +
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest,
|
| MirrorModeLetterboxing);
|
| @@ -43,6 +47,19 @@ class ASH_EXPORT TouchTransformerController
|
| FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest, SoftwareMirrorMode);
|
| FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest, ExtendedMode);
|
| FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest, TouchRadiusScale);
|
| + FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest, OzoneTranslation);
|
| + FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest,
|
| + AccurateUserTouchCalibration);
|
| + FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest,
|
| + ErrorProneUserTouchCalibration);
|
| + FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest,
|
| + ResolutionChangeUserTouchCalibration);
|
| + FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest,
|
| + DifferentBoundsUserTouchCalibration);
|
| + FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest,
|
| + LetterboxingUserTouchCalibration);
|
| + FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest,
|
| + PillarBoxingUserTouchCalibration);
|
|
|
| // Returns a transform that will be used to change an event's location from
|
| // the touchscreen's coordinate system into |display|'s coordinate system.
|
| @@ -82,6 +99,8 @@ class ASH_EXPORT TouchTransformerController
|
| const display::ManagedDisplayInfo& touch_display,
|
| const display::ManagedDisplayInfo& target_display) const;
|
|
|
| + bool is_calibrating_ = false;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(TouchTransformerController);
|
| };
|
|
|
|
|