Fix next compat to convey state for classic.

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 56 matching lines @@
    * @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_([
+  this.nextCompatRegExp_ = Background.globsToRegExp_([
     '*docs.google.com*'
   ]);
 
   /**
    * @type {cursors.Range}
    * @private
    */
   this.currentRange_ = null;
 
   /**
@@ skipping 155 matching lines @@
       return useNext ? ChromeVoxMode.FORCE_NEXT : ChromeVoxMode.CLASSIC;
 
     // 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 nextSite = this.isWhitelistedForNext_(topLevelRoot.docUrl);
-    var nextCompat = this.NextCompatRegExp_.test(topLevelRoot.docUrl);
+    var nextCompat = this.nextCompatRegExp_.test(topLevelRoot.docUrl);
     var classicCompat =
         this.isWhitelistedForClassicCompat_(topLevelRoot.docUrl);
     if (nextCompat && useNext)
       return ChromeVoxMode.NEXT_COMPAT;
     else if (classicCompat && !useNext)
       return ChromeVoxMode.CLASSIC_COMPAT;
     else if (nextSite)
       return ChromeVoxMode.NEXT;
     else if (!useNext)
       return ChromeVoxMode.CLASSIC;
@@ skipping 289 matching lines @@
     }
     return true;
   },
 
   /**
    * Returns true if the url should have Classic running.
    * @return {boolean}
    * @private
    */
   shouldEnableClassicForUrl_: function(url) {
-    return this.mode != ChromeVoxMode.FORCE_NEXT &&
-        !this.isBlacklistedForClassic_(url) &&
-        !this.isWhitelistedForNext_(url);
+    return this.nextCompatRegExp_.test(url) ||
+        (this.mode != ChromeVoxMode.FORCE_NEXT &&
+         !this.isBlacklistedForClassic_(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 34 matching lines @@
    * forNextCompat: filters out tabs that have been listed for next compat (i.e.
    *     should retain content script).
    */
   disableClassicChromeVox_: function(params) {
     var disableChromeVoxCommand = {
       message: 'SYSTEM_COMMAND',
       command: 'killChromeVox'
     };
 
     if (params.forNextCompat) {
-      var reStr = this.NextCompatRegExp_.toString();
+      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++)
         chrome.tabs.sendMessage(tab.id, disableChromeVoxCommand);
     } else {
       // Send to all ChromeVox clients.
       cvox.ExtensionBridge.send(disableChromeVoxCommand);
@@ skipping 138 matching lines @@
   return new RegExp('^(' + globs.map(function(glob) {
     return glob.replace(/[.+^$(){}|[\]\\]/g, '\\$&')
         .replace(/\*/g, '.*')
         .replace(/\?/g, '.');
   }).join('|') + ')$');
 };
 
 new Background();
 
 });  // goog.scope