Add a color argument to accessibilityPrivate.setFocusRing

chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 62 matching lines @@
       base::TimeDelta::FromMilliseconds(kCursorFadeOutTimeMilliseconds);
   caret_animation_info_.fade_in_time =
       base::TimeDelta::FromMilliseconds(kCaretFadeInTimeMilliseconds);
   caret_animation_info_.fade_out_time =
       base::TimeDelta::FromMilliseconds(kCaretFadeOutTimeMilliseconds);
 }
 
 AccessibilityFocusRingController::~AccessibilityFocusRingController() {
 }
 
+void AccessibilityFocusRingController::SetFocusRingColor(SkColor color) {
+  has_focus_ring_color_ = true;
+  focus_ring_color_ = color;
+  UpdateFocusRingsFromFocusRects();
+}
+
+void AccessibilityFocusRingController::ResetFocusRingColor() {
+  has_focus_ring_color_ = false;
+  UpdateFocusRingsFromFocusRects();
+}
+
 void AccessibilityFocusRingController::SetFocusRing(
     const std::vector<gfx::Rect>& rects,
     AccessibilityFocusRingController::FocusRingBehavior focus_ring_behavior) {
   focus_ring_behavior_ = focus_ring_behavior;
   OnLayerChange(&focus_animation_info_);
   focus_rects_ = rects;
   UpdateFocusRingsFromFocusRects();
 }
 
 void AccessibilityFocusRingController::HideFocusRing() {
@@ skipping 18 matching lines @@
       focus_layers_[0]->CanAnimate()) {
     // In PERSIST mode, animate the first ring to its destination
     // location, then set the rest of the rings directly.
     for (size_t i = 1; i < focus_rings_.size(); ++i)
       focus_layers_[i]->Set(focus_rings_[i]);
   } else {
     // In FADE mode, set all focus rings to their destination location.
     for (size_t i = 0; i < focus_rings_.size(); ++i)
       focus_layers_[i]->Set(focus_rings_[i]);
   }
+
+  for (size_t i = 0; i < focus_rings_.size(); ++i) {
+    if (has_focus_ring_color_)
+      focus_layers_[i]->SetColor(focus_ring_color_);
+    else
+      focus_layers_[i]->ResetColor();
+  }
 }
 
 void AccessibilityFocusRingController::OnLayerChange(
     AccessibilityFocusRingController::LayerAnimationInfo* animation_info) {
   animation_info->change_time = base::TimeTicks::Now();
   if (animation_info->opacity == 0)
     animation_info->start_time = animation_info->change_time;
 }
 
 void AccessibilityFocusRingController::SetCursorRing(
@@ skipping 336 matching lines @@
 
   ComputeOpacity(&caret_animation_info_, timestamp);
   if (caret_animation_info_.opacity == 0.0) {
     caret_layer_.reset();
     return;
   }
   caret_layer_->SetOpacity(caret_animation_info_.opacity);
 }
 
 }  // namespace chromeos