| OLD | NEW |
| 1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include "ash/shell.h" | 5 #include "ash/shell.h" |
| 6 #include "chrome/browser/chromeos/accessibility/accessibility_highlight_manager.
h" | 6 #include "chrome/browser/chromeos/accessibility/accessibility_highlight_manager.
h" |
| 7 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h" | 7 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h" |
| 8 #include "content/public/browser/focused_node_details.h" | 8 #include "content/public/browser/focused_node_details.h" |
| 9 #include "content/public/browser/notification_service.h" | 9 #include "content/public/browser/notification_service.h" |
| 10 #include "content/public/browser/notification_types.h" | 10 #include "content/public/browser/notification_types.h" |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 | 132 |
| 133 void AccessibilityHighlightManager::OnCursorVisibilityChanged(bool is_visible) { | 133 void AccessibilityHighlightManager::OnCursorVisibilityChanged(bool is_visible) { |
| 134 UpdateCursorHighlight(); | 134 UpdateCursorHighlight(); |
| 135 } | 135 } |
| 136 | 136 |
| 137 bool AccessibilityHighlightManager::IsCursorVisible() { | 137 bool AccessibilityHighlightManager::IsCursorVisible() { |
| 138 return ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible(); | 138 return ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible(); |
| 139 } | 139 } |
| 140 | 140 |
| 141 void AccessibilityHighlightManager::UpdateFocusAndCaretHighlights() { | 141 void AccessibilityHighlightManager::UpdateFocusAndCaretHighlights() { |
| 142 auto controller = AccessibilityFocusRingController::GetInstance(); | 142 auto* controller = AccessibilityFocusRingController::GetInstance(); |
| 143 | 143 |
| 144 // The caret highlight takes precedence over the focus highlight if | 144 // The caret highlight takes precedence over the focus highlight if |
| 145 // both are visible. | 145 // both are visible. |
| 146 if (caret_ && caret_visible_) { | 146 if (caret_ && caret_visible_) { |
| 147 controller->SetCaretRing(caret_point_); | 147 controller->SetCaretRing(caret_point_); |
| 148 controller->SetFocusRing( | 148 controller->SetFocusRing( |
| 149 std::vector<gfx::Rect>(), | 149 std::vector<gfx::Rect>(), |
| 150 AccessibilityFocusRingController::FADE_OUT_FOCUS_RING); | 150 AccessibilityFocusRingController::FADE_OUT_FOCUS_RING); |
| 151 } else if (focus_) { | 151 } else if (focus_) { |
| 152 controller->SetCaretRing(OffscreenPoint()); | 152 controller->SetCaretRing(OffscreenPoint()); |
| (...skipping 16 matching lines...) Expand all Loading... |
| 169 if (!cursor_) | 169 if (!cursor_) |
| 170 point = OffscreenPoint(); | 170 point = OffscreenPoint(); |
| 171 | 171 |
| 172 if (!IsCursorVisible()) | 172 if (!IsCursorVisible()) |
| 173 point = OffscreenPoint(); | 173 point = OffscreenPoint(); |
| 174 | 174 |
| 175 AccessibilityFocusRingController::GetInstance()->SetCursorRing(point); | 175 AccessibilityFocusRingController::GetInstance()->SetCursorRing(point); |
| 176 } | 176 } |
| 177 | 177 |
| 178 } // namespace chromeos | 178 } // namespace chromeos |
| OLD | NEW |