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

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

Issue 2717943002: Fix cc/paint skia type mismatches (Closed)
Patch Set: Rebase Created 3 years, 9 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 "cc/paint/paint_flags.h"
9 #include "ui/compositor/layer_animation_observer.h" 10 #include "ui/compositor/layer_animation_observer.h"
10 #include "ui/display/display.h" 11 #include "ui/display/display.h"
11 #include "ui/gfx/animation/animation_delegate.h" 12 #include "ui/gfx/animation/animation_delegate.h"
12 #include "ui/views/view.h" 13 #include "ui/views/view.h"
13 14
14 namespace views { 15 namespace views {
15 class Label; 16 class Label;
16 class Widget; 17 class Widget;
17 } 18 }
18 19
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 void InitViewContents(); 106 void InitViewContents();
106 107
107 // The target display on which this view is rendered on. 108 // The target display on which this view is rendered on.
108 const display::Display display_; 109 const display::Display display_;
109 110
110 // True if this view is on the display that is being calibrated. 111 // True if this view is on the display that is being calibrated.
111 bool is_primary_view_ = false; 112 bool is_primary_view_ = false;
112 113
113 std::unique_ptr<views::Widget> widget_; 114 std::unique_ptr<views::Widget> widget_;
114 115
115 SkPaint paint_; 116 cc::PaintFlags flags_;
116 117
117 // Defines the bounds for the background animation. 118 // Defines the bounds for the background animation.
118 gfx::RectF background_rect_; 119 gfx::RectF background_rect_;
119 120
120 // Text label indicating how to exit the touch calibration. 121 // Text label indicating how to exit the touch calibration.
121 views::Label* exit_label_; 122 views::Label* exit_label_;
122 // Text label indicating the significance of the touch point on screen. 123 // Text label indicating the significance of the touch point on screen.
123 views::Label* tap_label_; 124 views::Label* tap_label_;
124 125
125 // Start and end opacity values used during the fade animation. This is set 126 // Start and end opacity values used during the fade animation. This is set
(...skipping 21 matching lines...) Expand all
147 views::View* touch_point_view_; 148 views::View* touch_point_view_;
148 149
149 State state_ = UNKNOWN; 150 State state_ = UNKNOWN;
150 151
151 DISALLOW_COPY_AND_ASSIGN(TouchCalibratorView); 152 DISALLOW_COPY_AND_ASSIGN(TouchCalibratorView);
152 }; 153 };
153 154
154 } // namespace chromeos 155 } // namespace chromeos
155 156
156 #endif // CHROME_BROWSER_CHROMEOS_DISPLAY_TOUCH_CALIBRATOR_TOUCH_CALIBRATOR_VIE W_H_ 157 #endif // CHROME_BROWSER_CHROMEOS_DISPLAY_TOUCH_CALIBRATOR_TOUCH_CALIBRATOR_VIE W_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698