Updates to chromevoxclassic

TBR=dtseng@chromium.org

Change-Id: I806e8031d315948107885d16f0b58f0430780c1d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2598756Reviewed-by: David Tseng <dtseng@chromium.org>
Commit-Queue: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#838494}

ui/accessibility/extensions/chromevoxclassic/BUILD.gn

@@ -225,7 +225,6 @@ chromevox_out_dir = "$root_out_dir/chromevoxclassic"
 
 group("chromevox") {
   deps = [
-    ":accessibility_strings",
     ":chromevox_background_script",
     ":chromevox_content_script",
     ":chromevox_copied_files",

ui/accessibility/extensions/chromevoxclassic/README

@@ -21,6 +21,11 @@ assets, gets placed in
 
 out/Release/chromevoxclassic.
 
+The one exception is ./_locales. You must copy this directory manually to
+out/Release/chromevoxclassic.
+
+These translations are no longer part of mainline ChromeVox.
+
 #Loading and Testing
 Go to chrome://extensions, and click "Load
 Unpacked". Select out/Release/chromevoxclassic.
@@ -46,3 +51,9 @@ paths are verbalized using entirely different code paths.
 
 Once confirmed, the entire directory can be uploaded once zipped to the Chrome
 webstore.
+
+## A final note on branding
+
+In order to further differentiate ChromeVox from ChromeVox Classic, the Classic
+extension is now simply known as "Screen Reader" and scrubbed of the ChromeVox
+brand.
\ No newline at end of file

ui/accessibility/extensions/chromevoxclassic/chromevox/background/tabs_api_handler.js

@@ -208,15 +208,6 @@ cvox.TabsApiHandler.prototype = {
    * @private
    */
   refreshAutomationHandler_: function(tabId) {
-    if (!cvox.ChromeVox.isMac)
-      return;
-
-    chrome.automation.getTree(tabId, function(node) {
-      if (this.handler_)
-        this.handler_.removeAllListeners();
-
-      this.handler_ = new TabsAutomationHandler(node);
-    }.bind(this));
   },
 
   /**

ui/accessibility/extensions/chromevoxclassic/cvox2/background/desktop_automation_handler.js

@@ -42,7 +42,8 @@ DesktopAutomationHandler = function(node) {
   this.lastValueChanged_ = new Date(0);
 
   var e = EventType;
-  this.addListener_(e.ACTIVEDESCENDANTCHANGED, this.onActiveDescendantChanged);
+  this.addListener_(
+      e.ACTIVE_DESCENDANT_CHANGED, this.onActiveDescendantChanged);
   this.addListener_(e.ALERT, this.onAlert);
   this.addListener_(e.ARIA_ATTRIBUTE_CHANGED, this.onEventIfInRange);
   this.addListener_(e.CHECKED_STATE_CHANGED, this.onEventIfInRange);

ui/accessibility/extensions/chromevoxclassic/host/chrome/braille_background.js

@@ -63,7 +63,7 @@ cvox.BrailleBackground = function(opt_displayManagerForTest,
 
 /** @override */
 cvox.BrailleBackground.prototype.write = function(params) {
-  this.setContent_(params, null);
+  // Stubbed out.
 };
 
 

ui/accessibility/extensions/chromevoxclassic/manifest.json.jinja2

@@ -5,46 +5,14 @@
    "background": {
       "page": "cvox2/background/background.html"
    },
-   "commands": {
-      "nextObject": {
-         "description": "__MSG_CHROMEVOX_NEXT_OBJECT__",
-         "suggested_key": {
-            "default": "Alt+Shift+Right"
-         }
-      },
-      "performDefaultAction": {
-         "description": "__MSG_CHROMEVOX_PERFORM_DEFAULT_ACTION__",
-         "suggested_key": {
-            "default": "Alt+Shift+Space"
-         }
-      },
-      "previousObject": {
-         "description": "__MSG_CHROMEVOX_PREVIOUS_OBJECT__",
-         "suggested_key": {
-            "default": "Alt+Shift+Left"
-         }
-      },
-      "readFromHere": {
-         "description": "__MSG_CHROMEVOX_READ_FROM_HERE__",
-         "suggested_key": {
-            "default": "Alt+Shift+R"
-         }
-      },
-      "toggleChromeVoxVersion": {
-         "description": "__MSG_CHROMEVOX_TOGGLE_CHROMEVOX__",
-         "suggested_key": {
-            "default": "Alt+Shift+Q"
-         }
-      }
-   },
    "content_scripts": [ {
       "all_frames": true,
       "exclude_globs": [  ],
       "js": [ "chromeVoxChromePageScript.js" ],
-      "matches": [ "\u003Call_urls>" ]
+      "matches": [ "<all_urls>" ]
    } ],
    "default_locale": "en",
-   "description": "__MSG_CHROMEVOX_DESCRIPTION__",
+   "description": "A web-powered screen reader",
    "icons": {
       "128": "images/chromevox-128.png",
       "16": "images/chromevox-16.png",
@@ -52,10 +20,10 @@
    },
    "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEGBi/oD7Yl/Y16w3+gee/95/EUpRZ2U6c+8orV5ei+3CRsBsoXI/DPGBauZ3rWQ47aQnfoG00sXigFdJA2NhNK9OgmRA2evnsRRbjYm2BG1twpaLsgQPPus3PyczbDCvhFu8k24wzFyEtxLrfxAGBseBPb9QrCz7B4k2QgxD/CwIDAQAB",
    "manifest_version": 2,
-   "name": "__MSG_CHROMEVOX_NAME__",
+   "name": "Screen Reader",
    "options_page": "chromevox/background/options.html",
-   "permissions": [ "accessibilityPrivate", "bookmarks", "brailleDisplayPrivate", "commands.accessibility", "commandLinePrivate", "experimental", "history", "notifications", "storage", "tabs", "tts", "virtualKeyboardPrivate", "\u003Call_urls>" ],
+   "permissions": [ "accessibilityPrivate", "bookmarks", "history", "notifications", "storage", "tabs", "tts", "<all_urls>" ],
    "update_url": "https://clients2.google.com/service/update2/crx",
-   "version": "53.0.2784.6",
+   "version": "53.0.2784.8",
    "web_accessible_resources": [ "chromevox/background/keymaps/next_keymap.json", "chromevox/injected/api.js", "chromevox/injected/api_util.js", "chromevox/injected/mathjax.js", "chromevox/injected/mathjax_external_util.js" ]
 }