Chromium Code Reviews| Index: chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h |
| diff --git a/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h b/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h |
| index dec47afe4c74d06aca133b08a5aff69261a62ce9..31b495f527e003ae217bf0389db7983e790a6165 100644 |
| --- a/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h |
| +++ b/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h |
| @@ -22,6 +22,9 @@ class LinearAnimation; |
| namespace chromeos { |
| +class CircularThrobberView; |
| +class HintBox; |
| + |
| // An overlay view used during touch calibration. This view is responsible for |
| // all animations and UX during touch calibration on all displays currently |
| // active on the device. The view on the display being calibrated is the primary |
| @@ -90,6 +93,9 @@ class TouchCalibratorView : public views::View, public gfx::AnimationDelegate { |
| // The target display on which this view is rendered on. |
| const display::Display display_; |
| + // Offset from the edge of the screens for the touch points. |
| + const int touch_point_offset_; |
| + |
| // True if this view is on the display that is being calibrated. |
| bool is_primary_view_ = false; |
| @@ -112,6 +118,18 @@ class TouchCalibratorView : public views::View, public gfx::AnimationDelegate { |
| // and view translation. |
| std::unique_ptr<gfx::LinearAnimation> animator_; |
| + // View responsible for displaying the animated circular icon that the user |
| + // touches to calibrate the screen. |
| + CircularThrobberView* throbber_circle_; |
| + |
| + // A hint box displayed next to the first touch point to assist user with |
| + // information about the next step. |
| + HintBox* hint_box_view_; |
|
oshima
2017/01/05 23:29:04
looks like these views can also be just views::Vie
malaykeshav
2017/01/09 18:59:41
I need a rounded rectangle for the hint box. Would
oshima
2017/01/09 19:44:16
You can do that when you create the view, not late
malaykeshav
2017/01/09 22:29:57
Done
|
| + |
| + // View that contains the animated throbber circle and a text label informing |
| + // the user to tap the circle to continue calibration. |
| + views::View* touch_point_view_; |
| + |
| State state_ = UNKNOWN; |
| DISALLOW_COPY_AND_ASSIGN(TouchCalibratorView); |