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 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h" | 5 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h" |
6 | 6 |
7 #include "ash/display/window_tree_host_manager.h" | 7 #include "ash/display/window_tree_host_manager.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "chrome/browser/chromeos/ui/focus_ring_layer.h" | 10 #include "chrome/browser/chromeos/ui/focus_ring_layer.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 } | 32 } |
33 gfx::Rect bounds; | 33 gfx::Rect bounds; |
34 std::vector<gfx::Rect> rects; | 34 std::vector<gfx::Rect> rects; |
35 }; | 35 }; |
36 | 36 |
37 } // namespace | 37 } // namespace |
38 | 38 |
39 // static | 39 // static |
40 AccessibilityFocusRingController* | 40 AccessibilityFocusRingController* |
41 AccessibilityFocusRingController::GetInstance() { | 41 AccessibilityFocusRingController::GetInstance() { |
42 return Singleton<AccessibilityFocusRingController>::get(); | 42 return base::Singleton<AccessibilityFocusRingController>::get(); |
43 } | 43 } |
44 | 44 |
45 AccessibilityFocusRingController::AccessibilityFocusRingController() | 45 AccessibilityFocusRingController::AccessibilityFocusRingController() |
46 : compositor_(nullptr) { | 46 : compositor_(nullptr) { |
47 } | 47 } |
48 | 48 |
49 AccessibilityFocusRingController::~AccessibilityFocusRingController() { | 49 AccessibilityFocusRingController::~AccessibilityFocusRingController() { |
50 } | 50 } |
51 | 51 |
52 void AccessibilityFocusRingController::SetFocusRing( | 52 void AccessibilityFocusRingController::SetFocusRing( |
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
324 } | 324 } |
325 | 325 |
326 void AccessibilityFocusRingController::OnCompositingShuttingDown( | 326 void AccessibilityFocusRingController::OnCompositingShuttingDown( |
327 ui::Compositor* compositor) { | 327 ui::Compositor* compositor) { |
328 DCHECK_EQ(compositor_, compositor); | 328 DCHECK_EQ(compositor_, compositor); |
329 compositor_->RemoveAnimationObserver(this); | 329 compositor_->RemoveAnimationObserver(this); |
330 compositor_ = nullptr; | 330 compositor_ = nullptr; |
331 } | 331 } |
332 | 332 |
333 } // namespace chromeos | 333 } // namespace chromeos |
OLD | NEW |