Add BUILD file for Caret Browsing extension, update one string.

The last time we updated this was before the GYP -> GN switch.
This change adds a build rule for the caret browsing extension.

Also fixes description of keyboard shortcut for Caret Browsing on
Chrome OS. The right way to generate F7 is Search+IncreaseBrightness now,
not Alt.

Bug: none
Change-Id: I70b645ce65e2f5e8310cec6ce02e3083b9f6e2df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1850197Reviewed-by: David Tseng <dtseng@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708355}

ui/accessibility/extensions/BUILD.gn

@@ -6,17 +6,11 @@ import("//tools/grit/grit_rule.gni")
 
 group("extensions") {
   deps = [
+    ":caretbrowsing",
     ":colorenhancer",
   ]
 }
 
-group("colorenhancer") {
-  deps = [
-    ":colorenhancer_copy",
-    ":colorenhancer_strings",
-  ]
-}
-
 locale_files = [
   "_locales/am/messages.json",
   "_locales/ar/messages.json",
@@ -73,6 +67,17 @@ locale_files = [
   "_locales/zh_TW/messages.json",
 ]
 
+#
+# Color Enhancer
+#
+
+group("colorenhancer") {
+  deps = [
+    ":colorenhancer_copy",
+    ":colorenhancer_strings",
+  ]
+}
+
 grit("colorenhancer_strings") {
   source = "strings/accessibility_extensions_strings.grd"
   outputs = locale_files
@@ -103,3 +108,46 @@ copy("colorenhancer_copy") {
     "$root_out_dir/{{source_target_relative}}",
   ]
 }
+
+#
+# Caret Browsing
+#
+
+group("caretbrowsing") {
+  deps = [
+    ":caretbrowsing_copy",
+    ":caretbrowsing_strings",
+  ]
+}
+
+grit("caretbrowsing_strings") {
+  source = "strings/accessibility_extensions_strings.grd"
+  outputs = locale_files
+  output_dir = "$root_out_dir/caretbrowsing"
+  depfile_dir = "$root_out_dir"
+  resource_ids = ""
+}
+
+caretbrowsing_files = [
+  "caretbrowsing/background.js",
+  "caretbrowsing/caret_128.png",
+  "caretbrowsing/caret_16.png",
+  "caretbrowsing/caret_19_on.png",
+  "caretbrowsing/caret_19.png",
+  "caretbrowsing/caret_48.png",
+  "caretbrowsing/caretbrowsing.css",
+  "caretbrowsing/caretbrowsing.js",
+  "caretbrowsing/increase_brightness.png",
+  "caretbrowsing/manifest.json",
+  "caretbrowsing/options.html",
+  "caretbrowsing/options.js",
+  "caretbrowsing/traverse_util.js",
+  "//third_party/accessibility-audit/axs_testing.js",
+]
+
+copy("caretbrowsing_copy") {
+  sources = caretbrowsing_files
+  outputs = [
+    "$root_out_dir/caretbrowsing/{{source_file_part}}",
+  ]
+}

ui/accessibility/extensions/README.chromium

@@ -6,8 +6,7 @@ one-click install from the Settings page.
 # Building
 #
 
-Right now only the colorenhancer needs to be built, because it has localized
-strings. To build it:
+Some of the extensions have localized strings and need to be built:
 
 ninja -C out/Release ui/accessibility/extensions
 

ui/accessibility/extensions/caretbrowsing/_locales/en/messages.json

@@ -28,8 +28,8 @@
     "description": "Instructions for how to enable or disable this feature on any platform other than Chrome OS."
   },
   "enableDisableCros": {
-    "message": "Press <span class='key'>Alt</span> + <img src='increase_brightness.png'> (the Increase Brightness key, or F7) to turn on Caret Browsing. Press it again to turn it off.",
-    "description": "Instructions for how to enable or disable this feature on a Chromebook, where you have to hold Alt and press the special Increase Brightness key on the top of the keyboard, or F7 if you're using an alternate keyboard."
+    "message": "Press <span class='key'>Search</span> + <img src='increase_brightness.png'> (the Increase Brightness key, or F7) to turn on Caret Browsing. Press it again to turn it off.",
+    "description": "Instructions for how to enable or disable this feature on a Chromebook, where you have to hold Search and press the special Increase Brightness key on the top of the keyboard, or F7 if you're using an alternate keyboard."
   },
   "moveByWordsNonMac": {
     "message": "Hold down <span class='key'>Control</span> to move by words.",

ui/accessibility/extensions/caretbrowsing/caretbrowsing.js

@@ -618,8 +618,8 @@ CaretBrowsing.updateCaretOrSelection = function(scrollToSelection) {
   var style = window.getComputedStyle(elem);
   var bg = axs.utils.getBgColor(style, elem);
   var fg = axs.utils.getFgColor(style, elem, bg);
-  CaretBrowsing.caretBackground = axs.utils.colorToString(bg);
-  CaretBrowsing.caretForeground = axs.utils.colorToString(fg);
+  CaretBrowsing.caretBackground = axs.color.colorToString(bg);
+  CaretBrowsing.caretForeground = axs.color.colorToString(fg);
 
   if (scrollToSelection) {
     // Scroll just to the "focus" position of the selection,

ui/accessibility/extensions/caretbrowsing/manifest.json

 {
   "name": "__MSG_CARET_BROWSING_APPNAME__",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "__MSG_CARET_BROWSING_APPDESC__",
   "manifest_version": 2,
   "permissions": [

ui/accessibility/extensions/strings/accessibility_extensions_strings.grd

@@ -217,8 +217,8 @@
       <message desc="The title of the options page." name="IDS_CARET_BROWSING_CARETBROWSINGOPTIONS">
         Caret Browsing Options
       </message>
-      <message desc="Instructions for how to enable or disable this feature on a Chromebook, where you have to hold Alt and press the special Increase Brightness key on the top of the keyboard, or F7 if you're using an alternate keyboard." name="IDS_CARET_BROWSING_ENABLEDISABLECROS">
-        Press &lt;span class='key'&gt;Alt&lt;/span&gt; + &lt;img src='increase_brightness.png'&gt; (the Increase Brightness key, or F7) to turn on Caret Browsing. Press it again to turn it off.
+      <message desc="Instructions for how to enable or disable this feature on a Chromebook, where you have to hold Search and press the special Increase Brightness key on the top of the keyboard, or F7 if you're using an alternate keyboard." name="IDS_CARET_BROWSING_ENABLEDISABLECROS">
+        Press &lt;span class='key'&gt;Search&lt;/span&gt; + &lt;img src='increase_brightness.png'&gt; (the Increase Brightness key, or F7) to turn on Caret Browsing. Press it again to turn it off.
       </message>
       <message desc="Instructions for how to enable or disable this feature on any platform other than Chrome OS." name="IDS_CARET_BROWSING_ENABLEDISABLENONCROS">
         Press &lt;span class='key'&gt;F7&lt;/span&gt; to turn on Caret Browsing. Press it again to turn it off.