Minimize the Classic API and enable it for Next

chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js

 // 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.
 
 /**
  * @fileoverview The entry point for all ChromeVox2 related code for the
  * background page.
  */
 
 goog.provide('Background');
@@ skipping 55 matching lines @@
 
   /**
    * Regular expression for blacklisting classic.
    * @type {RegExp}
    * @private
    */
   this.classicBlacklistRegExp_ = Background.globsToRegExp_(
       chrome.runtime.getManifest()['content_scripts'][0]['exclude_globs']);
 
   /**
-   * Regular expression for whitelisting Next compat.
-   * @type {RegExp}
-   * @private
-   */
-  this.nextCompatRegExp_ = Background.globsToRegExp_([
-    '*docs.google.com/document/*',
-    '*docs.google.com/spreadsheets/*',
-    '*docs.google.com/presentation/*'
-  ]);
-
-  /**
    * @type {cursors.Range}
    * @private
    */
   this.currentRange_ = null;
 
   // Manually bind all functions to |this|.
   for (var func in this) {
     if (typeof(this[func]) == 'function')
       this[func] = this[func].bind(this);
   }
 
   /** @type {!cvox.AbstractEarcons} @private */
   this.classicEarcons_ = cvox.ChromeVox.earcons || new cvox.ClassicEarcons();
 
   /** @type {!cvox.AbstractEarcons} @private */
   this.nextEarcons_ = new NextEarcons();
 
   // Turn cvox.ChromeVox.earcons into a getter that returns either the
   // Next earcons or the Classic earcons depending on the current mode.
   Object.defineProperty(cvox.ChromeVox, 'earcons', {
     get: (function() {
       if (this.mode === ChromeVoxMode.FORCE_NEXT ||
-          this.mode === ChromeVoxMode.NEXT ||
-          this.mode === ChromeVoxMode.NEXT_COMPAT) {
+          this.mode === ChromeVoxMode.NEXT) {
         return this.nextEarcons_;
       } else {
         return this.classicEarcons_;
       }
     }).bind(this)
   });
 
   if (cvox.ChromeVox.isChromeOS) {
     Object.defineProperty(cvox.ChromeVox, 'modKeyStr', {
       get: function() {
@@ skipping 127 matching lines @@
 
     // Closure complains, but clearly, |target| is not null.
     var topLevelRoot =
         AutomationUtil.getTopLevelRoot(/** @type {!AutomationNode} */(target));
     if (!topLevelRoot)
       return useNext ? ChromeVoxMode.FORCE_NEXT :
           ChromeVoxMode.CLASSIC_COMPAT;
 
     var docUrl = topLevelRoot.docUrl || '';
     var nextSite = this.isWhitelistedForNext_(docUrl);
-    var nextCompat = this.nextCompatRegExp_.test(docUrl) &&
-        this.chromeChannel_ != 'dev';
     var classicCompat =
         this.isWhitelistedForClassicCompat_(docUrl);
-    if (nextCompat && useNext)
-      return ChromeVoxMode.NEXT_COMPAT;
-    else if (classicCompat && !useNext)
+    if (classicCompat && !useNext)
       return ChromeVoxMode.CLASSIC_COMPAT;
     else if (nextSite)
       return ChromeVoxMode.NEXT;
     else if (!useNext)
       return ChromeVoxMode.CLASSIC;
     else
       return ChromeVoxMode.FORCE_NEXT;
   },
 
   /**
    * Handles a mode change.
    * @param {ChromeVoxMode} newMode
    * @param {?ChromeVoxMode} oldMode Can be null at startup when no range was
    *  previously set.
    * @private
    */
   onModeChanged_: function(newMode, oldMode) {
     this.keyboardHandler_.onModeChanged(newMode, oldMode);
     CommandHandler.onModeChanged(newMode, oldMode);
     FindHandler.onModeChanged(newMode, oldMode);
     Notifications.onModeChange(newMode, oldMode);
 
     // The below logic handles transition between the classic engine
     // (content script) and next engine (no content script) as well as
     // misc states that are not handled above.
 
     // Classic modes do not use the new focus highlight.
-    if (newMode == ChromeVoxMode.CLASSIC ||
-        newMode == ChromeVoxMode.NEXT_COMPAT)
+    if (newMode == ChromeVoxMode.CLASSIC)
       chrome.accessibilityPrivate.setFocusRing([]);
 
     // Switch on/off content scripts.
     // note that |this.currentRange_| can *change* because the request is
     // async. Save it to ensure we're looking at the currentRange at this moment
     // in time.
     var cur = this.currentRange_;
     chrome.tabs.query({active: true,
                        lastFocusedWindow: true}, function(tabs) {
       if (newMode == ChromeVoxMode.CLASSIC) {
         // Generally, we don't want to inject classic content scripts as it is
         // done by the extension system at document load. The exception is when
         // we toggle classic on manually as part of a user command.
-        // Note that classic -> next_compat is ignored here because classic
-        // should have already enabled content scripts.
         if (oldMode == ChromeVoxMode.FORCE_NEXT) {
           cvox.ChromeVox.injectChromeVoxIntoTabs(tabs);
         }
       } else if (newMode === ChromeVoxMode.FORCE_NEXT) {
-        // Disable ChromeVox everywhere except for things whitelisted
-        // for next compat.
-        this.disableClassicChromeVox_({forNextCompat: true});
-      } else if (newMode != ChromeVoxMode.NEXT_COMPAT) {
+        this.disableClassicChromeVox_();
+      } else {
         // If we're focused in the desktop tree, do nothing.
         if (cur && !cur.isWebRange())
           return;
 
         // If we're entering classic compat mode or next mode for just one tab,
         // disable Classic for that tab only.
-        this.disableClassicChromeVox_({tabs: tabs});
+        this.disableClassicChromeVox_(tabs);
       }
     }.bind(this));
 
     // Switching into either compat or classic.
     if (oldMode === ChromeVoxMode.NEXT ||
         oldMode === ChromeVoxMode.FORCE_NEXT) {
       // Make sure we cancel the progress loading sound just in case.
       cvox.ChromeVox.earcons.cancelEarcon(cvox.Earcon.PAGE_START_LOADING);
       (new PanelCommand(PanelCommandType.DISABLE_MENUS)).send();
     }
@@ skipping 240 matching lines @@
     }
     return true;
   },
 
   /**
    * Returns true if the url should have Classic running.
    * @return {boolean}
    * @private
    */
   shouldEnableClassicForUrl_: function(url) {
-    return (this.nextCompatRegExp_.test(url) &&this.chromeChannel_ != 'dev') ||
-        (this.mode != ChromeVoxMode.FORCE_NEXT &&
+    return this.mode != ChromeVoxMode.FORCE_NEXT &&
          !this.isBlacklistedForClassic_(url) &&
-         !this.isWhitelistedForNext_(url));
+        !this.isWhitelistedForNext_(url);
   },
 
   /**
    * Compat mode is on if any of the following are true:
    * 1. a url is blacklisted for Classic.
    * 2. the current range is not within web content.
    * @param {string} url
    * @return {boolean}
    */
   isWhitelistedForClassicCompat_: function(url) {
@@ skipping 20 matching lines @@
    * @private
    */
   isWhitelistedForNext_: function(url) {
     return this.whitelist_.some(function(item) {
       return url.indexOf(item) != -1;
     });
   },
 
   /**
    * Disables classic ChromeVox in current web content.
-   * @param {{tabs: (Array<Tab>|undefined),
-   *          forNextCompat: (boolean|undefined)}} params
-   * tabs: The tabs where ChromeVox scripts should be disabled. If null, will
-   *     disable ChromeVox everywhere.
-   * forNextCompat: filters out tabs that have been listed for next compat (i.e.
-   *     should retain content script).
+   * @param {Array<Tab>=} opt_tabs The tabs where ChromeVox scripts should be
+   * disabled. If null, will disable ChromeVox everywhere.
    */
-  disableClassicChromeVox_: function(params) {
+  disableClassicChromeVox_: function(opt_tabs) {
     var disableChromeVoxCommand = {
       message: 'SYSTEM_COMMAND',
       command: 'killChromeVox'
     };
 
-    if (params.forNextCompat) {
-      var reStr = this.nextCompatRegExp_.toString();
-      disableChromeVoxCommand['excludeUrlRegExp'] =
-          reStr.substring(1, reStr.length - 1);
-    }
-
-    if (params.tabs) {
-      for (var i = 0, tab; tab = params.tabs[i]; i++)
+    if (opt_tabs) {
+      for (var i = 0, tab; tab = opt_tabs[i]; i++)
         chrome.tabs.sendMessage(tab.id, disableChromeVoxCommand);
     } else {
       // Send to all ChromeVox clients.
       cvox.ExtensionBridge.send(disableChromeVoxCommand);
     }
   },
 
   /**
    * @param {!Spannable} text
    * @param {number} position
@@ skipping 191 matching lines @@
   return new RegExp('^(' + globs.map(function(glob) {
     return glob.replace(/[.+^$(){}|[\]\\]/g, '\\$&')
         .replace(/\*/g, '.*')
         .replace(/\?/g, '.');
   }).join('|') + ')$');
 };
 
 new Background();
 
 });  // goog.scope