Add a color argument to accessibilityPrivate.setFocusRing

chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_CONTROLLER_H_
 
 #include <memory>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.h"
 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_layer.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace chromeos {
 
 // AccessibilityFocusRingController handles drawing custom rings around
 // the focused object, cursor, and/or caret for accessibility.
 class AccessibilityFocusRingController : public FocusRingLayerDelegate {
  public:
   // Get the single instance of this class.
   static AccessibilityFocusRingController* GetInstance();
 
   enum FocusRingBehavior { FADE_OUT_FOCUS_RING, PERSIST_FOCUS_RING };
 
+  // Set the focus ring color, or reset it back to the default.
+  void SetFocusRingColor(SkColor color);
+  void ResetFocusRingColor();
+
   // Draw a focus ring around the given set of rects, in global screen
   // coordinates. Use |focus_ring_behavior| to specify whether the focus
   // ring should persist or fade out.
   void SetFocusRing(const std::vector<gfx::Rect>& rects,
                     FocusRingBehavior focus_ring_behavior);
   void HideFocusRing();
 
   // Draw a ring around the mouse cursor. It fades out automatically.
   void SetCursorRing(const gfx::Point& location);
   void HideCursorRing();
@@ skipping 53 matching lines @@
   void OnLayerChange(LayerAnimationInfo* animation_info);
   void ComputeOpacity(LayerAnimationInfo* animation_info,
                       base::TimeTicks timestamp);
 
   LayerAnimationInfo focus_animation_info_;
   std::vector<gfx::Rect> focus_rects_;
   std::vector<AccessibilityFocusRing> previous_focus_rings_;
   std::vector<AccessibilityFocusRing> focus_rings_;
   std::vector<std::unique_ptr<AccessibilityFocusRingLayer>> focus_layers_;
   FocusRingBehavior focus_ring_behavior_ = FADE_OUT_FOCUS_RING;
+  bool has_focus_ring_color_ = false;

[Devlin, 2017/03/30 21:58:05]

Drive-by: if you use a base::Optional<SkColor> for focus_ring_color_, you don't
have to have this extra member.

[dmazzoni, 2017/03/31 20:24:05]

Good idea! That's definitely cleaner.

+  SkColor focus_ring_color_ = SK_ColorBLACK;
 
   LayerAnimationInfo cursor_animation_info_;
   gfx::Point cursor_location_;
   std::unique_ptr<AccessibilityCursorRingLayer> cursor_layer_;
 
   LayerAnimationInfo caret_animation_info_;
   gfx::Point caret_location_;
   std::unique_ptr<AccessibilityCursorRingLayer> caret_layer_;
 
   friend struct base::DefaultSingletonTraits<AccessibilityFocusRingController>;
 
   DISALLOW_COPY_AND_ASSIGN(AccessibilityFocusRingController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_CONTROLLER_H_