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

Side by Side Diff: chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h

Issue 2633423004: Displays the calibration complete message to touch calibration and gracefully quits (Closed)
Patch Set: Resolving comments Created 3 years, 11 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
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 #ifndef CHROME_BROWSER_CHROMEOS_DISPLAY_TOUCH_CALIBRATOR_TOUCH_CALIBRATOR_VIEW_H _ 5 #ifndef CHROME_BROWSER_CHROMEOS_DISPLAY_TOUCH_CALIBRATOR_TOUCH_CALIBRATOR_VIEW_H _
6 #define CHROME_BROWSER_CHROMEOS_DISPLAY_TOUCH_CALIBRATOR_TOUCH_CALIBRATOR_VIEW_H _ 6 #define CHROME_BROWSER_CHROMEOS_DISPLAY_TOUCH_CALIBRATOR_TOUCH_CALIBRATOR_VIEW_H _
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/compositor/layer_animation_observer.h" 9 #include "ui/compositor/layer_animation_observer.h"
10 #include "ui/display/display.h" 10 #include "ui/display/display.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 DISPLAY_POINT_1, // Static state where the touch point is at its first 47 DISPLAY_POINT_1, // Static state where the touch point is at its first
48 // location. 48 // location.
49 ANIMATING_1_TO_2, // Transition state when the touch point is being moved 49 ANIMATING_1_TO_2, // Transition state when the touch point is being moved
50 // from one location to another. 50 // from one location to another.
51 DISPLAY_POINT_2, // Static state where the touch point is at its second 51 DISPLAY_POINT_2, // Static state where the touch point is at its second
52 // location. 52 // location.
53 ANIMATING_2_TO_3, 53 ANIMATING_2_TO_3,
54 DISPLAY_POINT_3, // Static state where the touch point is at its third 54 DISPLAY_POINT_3, // Static state where the touch point is at its third
55 // location. 55 // location.
56 ANIMATING_3_TO_4, 56 ANIMATING_3_TO_4,
57 DISPLAY_POINT_4, // Static state where the touch point is at its final 57 DISPLAY_POINT_4, // Static state where the touch point is at its final
58 // location. 58 // location.
59 ANIMATING_FINAL_MESSAGE, // Transition state when the calibration complete
60 // message is being transitioned into view.
59 CALIBRATION_COMPLETE, // Static state when the calibration complete message 61 CALIBRATION_COMPLETE, // Static state when the calibration complete message
60 // is displayed to the user. 62 // is displayed to the user.
61 BACKGROUND_FADING_OUT // Transition state where the background is fading 63 BACKGROUND_FADING_OUT // Transition state where the background is fading
62 // out 64 // out
63 }; 65 };
64 66
65 TouchCalibratorView(const display::Display& target_display, 67 TouchCalibratorView(const display::Display& target_display,
66 bool is_primary_view); 68 bool is_primary_view);
67 ~TouchCalibratorView() override; 69 ~TouchCalibratorView() override;
68 70
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 std::unique_ptr<gfx::LinearAnimation> animator_; 132 std::unique_ptr<gfx::LinearAnimation> animator_;
131 133
132 // View responsible for displaying the animated circular icon that the user 134 // View responsible for displaying the animated circular icon that the user
133 // touches to calibrate the screen. 135 // touches to calibrate the screen.
134 CircularThrobberView* throbber_circle_; 136 CircularThrobberView* throbber_circle_;
135 137
136 // A hint box displayed next to the first touch point to assist user with 138 // A hint box displayed next to the first touch point to assist user with
137 // information about the next step. 139 // information about the next step.
138 views::View* hint_box_view_; 140 views::View* hint_box_view_;
139 141
142 // Final view containing the calibration complete message along with an icon.
143 views::View* completion_message_view_;
144
140 // View that contains the animated throbber circle and a text label informing 145 // View that contains the animated throbber circle and a text label informing
141 // the user to tap the circle to continue calibration. 146 // the user to tap the circle to continue calibration.
142 views::View* touch_point_view_; 147 views::View* touch_point_view_;
143 148
144 State state_ = UNKNOWN; 149 State state_ = UNKNOWN;
145 150
146 DISALLOW_COPY_AND_ASSIGN(TouchCalibratorView); 151 DISALLOW_COPY_AND_ASSIGN(TouchCalibratorView);
147 }; 152 };
148 153
149 } // namespace chromeos 154 } // namespace chromeos
150 155
151 #endif // CHROME_BROWSER_CHROMEOS_DISPLAY_TOUCH_CALIBRATOR_TOUCH_CALIBRATOR_VIE W_H_ 156 #endif // CHROME_BROWSER_CHROMEOS_DISPLAY_TOUCH_CALIBRATOR_TOUCH_CALIBRATOR_VIE W_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698