Reland: Make the check for compat mode explicit.

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 151 matching lines @@
     chrome.tabs.query({active: true}, function(tabs) {
       if (mode === 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.
         if (opt_injectClassic)
           cvox.ChromeVox.injectChromeVoxIntoTabs(tabs);
       } else {
         // When in compat mode, if the focus is within the desktop tree proper,
         // then do not disable content scripts.
-        if (this.currentRange_ &&
-            this.currentRange_.start.node.root.role == RoleType.desktop)
+        if (this.currentRange_ && !this.currentRange_.isWebRange())
           return;
 
         this.disableClassicChromeVox_();
       }
     }.bind(this));
 
     // If switching out of a ChromeVox Next mode, make sure we cancel
     // the progress loading sound just in case.
     if ((this.mode_ === ChromeVoxMode.NEXT ||
          this.mode_ === ChromeVoxMode.FORCE_NEXT) &&
         this.mode_ != mode) {
       cvox.ChromeVox.earcons.cancelEarcon(cvox.Earcon.PAGE_START_LOADING);
     }
 
     this.mode_ = mode;
   },
 
   /**
+   * Mode refreshes takes into account both |url| and the current ChromeVox
+   *    range. The latter gets used to decide if the user is or isn't in web
+   *    content. The focused state also needs to be set for this info to be
+   *    reliable.
    * @override
    */
   refreshMode: function(url) {
     var mode = this.mode_;
     if (mode != ChromeVoxMode.FORCE_NEXT) {
-      if (this.isWhitelistedForNext_(url))
+      if (this.isWhitelistedForNext_(url)) {
         mode = ChromeVoxMode.NEXT;
-      else if (this.isBlacklistedForClassic_(url))
+      } else if (this.isBlacklistedForClassic_(url) || (this.currentRange_ &&
+          !this.currentRange_.isWebRange() &&
+          this.currentRange_.start.node.state.focused)) {
         mode = ChromeVoxMode.COMPAT;
-      else
+      } else {
         mode = ChromeVoxMode.CLASSIC;
+      }
     }
 
     this.setMode(mode);
   },
 
   /**
    * @override
    */
   getCurrentRange: function() {
     return this.currentRange_;
@@ skipping 220 matching lines @@
         cvox.ChromeVox.isActive = !cvox.ChromeVox.isActive;
         if (!cvox.ChromeVox.isActive) {
           var msg = Msgs.getMsg('chromevox_inactive');
           cvox.ChromeVox.tts.speak(msg, cvox.QueueMode.FLUSH);
           return false;
         }
         break;
       case 'toggleChromeVoxVersion':
         var newMode;
         if (this.mode_ == ChromeVoxMode.FORCE_NEXT) {
-          var inViews =
-              this.currentRange_.start.node.root.role == RoleType.desktop;
-          newMode = inViews ? ChromeVoxMode.COMPAT : ChromeVoxMode.CLASSIC;
+          var inWeb = current.isWebRange();
+          newMode = inWeb ? ChromeVoxMode.CLASSIC : ChromeVoxMode.COMPAT;
         } else {
           newMode = ChromeVoxMode.FORCE_NEXT;
         }
         this.setMode(newMode, true);
 
         var isClassic =
             newMode == ChromeVoxMode.CLASSIC || newMode == ChromeVoxMode.COMPAT;
 
         // Leaving unlocalized as 'next' isn't an official name.
         cvox.ChromeVox.tts.speak(isClassic ?
@@ skipping 110 matching lines @@
         !this.isBlacklistedForClassic_(url) &&
         !this.isWhitelistedForNext_(url);
   },
 
   /**
    * @param {string} url
    * @return {boolean}
    * @private
    */
   isBlacklistedForClassic_: function(url) {
-    return url === '' || this.classicBlacklistRegExp_.test(url);
+    return this.classicBlacklistRegExp_.test(url);
   },
 
   /**
    * @param {string} url
    * @return {boolean} Whether the given |url| is whitelisted.
    * @private
    */
   isWhitelistedForNext_: function(url) {
     return this.whitelist_.some(function(item) {
       return url.indexOf(item) != -1;
@@ skipping 76 matching lines @@
     return glob.replace(/[.+^$(){}|[\]\\]/g, '\\$&')
         .replace(/\*/g, '.*')
         .replace(/\?/g, '.');
   }).join('|') + ')$');
 };
 
 /** @type {Background} */
 global.backgroundObj = new Background();
 
 });  // goog.scope