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/basictypes.h" | 10 #include "base/basictypes.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_vector.h" |
12 #include "base/memory/singleton.h" | 12 #include "base/memory/singleton.h" |
13 #include "base/time/time.h" | 13 #include "base/time/time.h" |
14 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_layer.h" | 14 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_layer.h" |
15 #include "ui/compositor/compositor_animation_observer.h" | 15 #include "ui/compositor/compositor_animation_observer.h" |
16 #include "ui/gfx/rect.h" | 16 #include "ui/gfx/rect.h" |
17 | 17 |
18 namespace ui { | 18 namespace ui { |
19 class Compositor; | 19 class Compositor; |
20 } | 20 } |
21 | 21 |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 void SplitIntoParagraphShape( | 62 void SplitIntoParagraphShape( |
63 const std::vector<gfx::Rect>& rects, | 63 const std::vector<gfx::Rect>& rects, |
64 gfx::Rect* top, | 64 gfx::Rect* top, |
65 gfx::Rect* middle, | 65 gfx::Rect* middle, |
66 gfx::Rect* bottom) const; | 66 gfx::Rect* bottom) const; |
67 bool Intersects(const gfx::Rect& r1, const gfx::Rect& r2) const; | 67 bool Intersects(const gfx::Rect& r1, const gfx::Rect& r2) const; |
68 | 68 |
69 std::vector<gfx::Rect> rects_; | 69 std::vector<gfx::Rect> rects_; |
70 std::vector<AccessibilityFocusRing> previous_rings_; | 70 std::vector<AccessibilityFocusRing> previous_rings_; |
71 std::vector<AccessibilityFocusRing> rings_; | 71 std::vector<AccessibilityFocusRing> rings_; |
72 std::vector<scoped_ptr<AccessibilityFocusRingLayer> > layers_; | 72 ScopedVector<AccessibilityFocusRingLayer> layers_; |
73 base::TimeTicks focus_change_time_; | 73 base::TimeTicks focus_change_time_; |
74 ui::Compositor* compositor_; | 74 ui::Compositor* compositor_; |
75 | 75 |
76 friend struct DefaultSingletonTraits<AccessibilityFocusRingController>; | 76 friend struct DefaultSingletonTraits<AccessibilityFocusRingController>; |
77 | 77 |
78 DISALLOW_COPY_AND_ASSIGN(AccessibilityFocusRingController); | 78 DISALLOW_COPY_AND_ASSIGN(AccessibilityFocusRingController); |
79 }; | 79 }; |
80 | 80 |
81 } // namespace chromeos | 81 } // namespace chromeos |
82 | 82 |
83 #endif // CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_CONTROLLER_H_ | 83 #endif // CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_CONTROLLER_H_ |
OLD | NEW |