OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_UI_ACCESSIBILITY_FOCUS_RING_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_CONTROLLER_H_ |
6 #define CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_CONTROLLER_H_ | 6 #define CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_CONTROLLER_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 std::vector<AccessibilityFocusRing> previous_rings_; | 84 std::vector<AccessibilityFocusRing> previous_rings_; |
85 std::vector<AccessibilityFocusRing> rings_; | 85 std::vector<AccessibilityFocusRing> rings_; |
86 ScopedVector<AccessibilityFocusRingLayer> layers_; | 86 ScopedVector<AccessibilityFocusRingLayer> layers_; |
87 base::TimeTicks focus_change_time_; | 87 base::TimeTicks focus_change_time_; |
88 ui::Compositor* compositor_; | 88 ui::Compositor* compositor_; |
89 | 89 |
90 base::TimeTicks cursor_start_time_; | 90 base::TimeTicks cursor_start_time_; |
91 base::TimeTicks cursor_change_time_; | 91 base::TimeTicks cursor_change_time_; |
92 gfx::Point cursor_location_; | 92 gfx::Point cursor_location_; |
93 float cursor_opacity_; | 93 float cursor_opacity_; |
94 scoped_ptr<AccessibilityCursorRingLayer> cursor_layer_; | 94 std::unique_ptr<AccessibilityCursorRingLayer> cursor_layer_; |
95 ui::Compositor* cursor_compositor_; | 95 ui::Compositor* cursor_compositor_; |
96 | 96 |
97 gfx::Point caret_location_; | 97 gfx::Point caret_location_; |
98 scoped_ptr<AccessibilityCursorRingLayer> caret_layer_; | 98 std::unique_ptr<AccessibilityCursorRingLayer> caret_layer_; |
99 | 99 |
100 friend struct base::DefaultSingletonTraits<AccessibilityFocusRingController>; | 100 friend struct base::DefaultSingletonTraits<AccessibilityFocusRingController>; |
101 | 101 |
102 DISALLOW_COPY_AND_ASSIGN(AccessibilityFocusRingController); | 102 DISALLOW_COPY_AND_ASSIGN(AccessibilityFocusRingController); |
103 }; | 103 }; |
104 | 104 |
105 } // namespace chromeos | 105 } // namespace chromeos |
106 | 106 |
107 #endif // CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_CONTROLLER_H_ | 107 #endif // CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_CONTROLLER_H_ |
OLD | NEW |