Add a color argument to accessibilityPrivate.setFocusRing

chrome/browser/accessibility/accessibility_extension_api.cc

 // Copyright (c) 2012 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/accessibility/accessibility_extension_api.h"
 
 #include <stddef.h>
 
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/chrome_extension_function_details.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/accessibility_private.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/lazy_background_task_queue.h"
 #include "extensions/common/error_utils.h"
+#include "extensions/common/image_util.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 
 using chromeos::AccessibilityFocusRingController;
 #endif
@@ skipping 37 matching lines @@
     base::DictionaryValue* rect_value = NULL;
     EXTENSION_FUNCTION_VALIDATE(rect_values->GetDictionary(i, &rect_value));
     int left, top, width, height;
     EXTENSION_FUNCTION_VALIDATE(rect_value->GetInteger(kLeft, &left));
     EXTENSION_FUNCTION_VALIDATE(rect_value->GetInteger(kTop, &top));
     EXTENSION_FUNCTION_VALIDATE(rect_value->GetInteger(kWidth, &width));
     EXTENSION_FUNCTION_VALIDATE(rect_value->GetInteger(kHeight, &height));
     rects.push_back(gfx::Rect(left, top, width, height));
   }
 
+  std::string color_str;
+  if (args_->GetSize() >= 2 && args_->GetString(1, &color_str)) {
+    SkColor color;
+    EXTENSION_FUNCTION_VALIDATE(

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

This will result in killing the renderer if the string was invalid.  That
*might* be the right thing to do, since this is a private API, but it'd make me
nervous.  Is there a reason to not just return an error if the string is
invalid?

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

Good idea, changed it to just return an error.

+        extensions::image_util::ParseHexColorString(color_str, &color));
+    AccessibilityFocusRingController::GetInstance()->SetFocusRingColor(color);
+  } else {
+    AccessibilityFocusRingController::GetInstance()->ResetFocusRingColor();
+  }
+
   // Move the visible focus ring to cover all of these rects.
   AccessibilityFocusRingController::GetInstance()->SetFocusRing(
       rects, AccessibilityFocusRingController::PERSIST_FOCUS_RING);
 
   // Also update the touch exploration controller so that synthesized
   // touch events are anchored within the focused object.
   if (!rects.empty()) {
     chromeos::AccessibilityManager* manager =
         chromeos::AccessibilityManager::Get();
     manager->SetTouchAccessibilityAnchorPoint(rects[0].CenterPoint());
@@ skipping 51 matching lines @@
 
   // Called twice to ensure the cros end of the dbus message is in a good
   // state.
   client->SetBacklightsForcedOff(!darken);
   client->SetBacklightsForcedOff(darken);
   return RespondNow(NoArguments());
 #endif  // defined OS_CHROMEOS
 
   return RespondNow(Error(kErrorNotSupported));
 }