Prepare ChromeVox for webstore release.

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');
 
 goog.require('AutomationPredicate');
 goog.require('AutomationUtil');
 goog.require('ChromeVoxState');
 goog.require('LiveRegions');
 goog.require('NextEarcons');
 goog.require('Notifications');
 goog.require('Output');
 goog.require('Output.EventType');
 goog.require('PanelCommand');
+goog.require('Stubs');
 goog.require('constants');
 goog.require('cursors.Cursor');
 goog.require('cvox.BrailleKeyCommand');
 goog.require('cvox.ChromeVoxBackground');
 goog.require('cvox.ChromeVoxEditableTextBase');
 goog.require('cvox.ChromeVoxKbHandler');
 goog.require('cvox.ClassicEarcons');
 goog.require('cvox.ExtensionBridge');
 goog.require('cvox.NavBraille');
 
@@ skipping 68 matching lines @@
         return this.nextEarcons_;
       } else {
         return this.classicEarcons_;
       }
     }).bind(this)
   });
 
   if (cvox.ChromeVox.isChromeOS) {
     Object.defineProperty(cvox.ChromeVox, 'modKeyStr', {
       get: function() {
-        return (this.mode == ChromeVoxMode.CLASSIC || this.mode ==
-            ChromeVoxMode.COMPAT) ?
+        return (this.mode == ChromeVoxMode.CLASSIC ||
+            this.mode == ChromeVoxMode.COMPAT) ?
                 'Search+Shift' : 'Search';
       }.bind(this)
     });
   }
 
   Object.defineProperty(cvox.ChromeVox, 'isActive', {
     get: function() {
       return localStorage['active'] !== 'false';
     },
     set: function(value) {
@@ skipping 18 matching lines @@
 
   /** @type {boolean} @private */
   this.inExcursion_ = false;
 
   /**
    * Stores the mode as computed the last time a current range was set.
    * @type {?ChromeVoxMode}
    */
   this.mode_ = null;
 
-  if (!chrome.accessibilityPrivate.setKeyboardListener)
-    chrome.accessibilityPrivate.setKeyboardListener = function() {};
-
-  if (cvox.ChromeVox.isChromeOS) {
-    chrome.accessibilityPrivate.onAccessibilityGesture.addListener(
-        this.onAccessibilityGesture_);
-
-    Notifications.onStartup();
-  }};
+  chrome.accessibilityPrivate.onAccessibilityGesture.addListener(
+      this.onAccessibilityGesture_);
+  Notifications.onStartup();
+};
 
 /**
  * @const {string}
  */
 Background.ISSUE_URL = 'https://code.google.com/p/chromium/issues/entry?' +
     'labels=Type-Bug,Pri-2,cvox2,OS-Chrome&' +
     'components=UI>accessibility&' +
     'description=';
 
 /**
@@ skipping 64 matching lines @@
   },
 
   /**
    * 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) {
-    // Switching key maps potentially affects the key codes that involve
-    // sequencing. Without resetting this list, potentially stale key codes
-    // remain. The key codes themselves get pushed in
-    // cvox.KeySequence.deserialize which gets called by cvox.KeyMap.
-    cvox.ChromeVox.sequenceSwitchKeyCodes = [];
-
-    var selectedKeyMap =
-        newMode == ChromeVoxMode.CLASSIC || newMode == ChromeVoxMode.COMPAT ?
-        'keymap_classic' : 'keymap_next';
-    window['prefs'].switchToKeyMap(selectedKeyMap);
-
     if (newMode == ChromeVoxMode.CLASSIC) {
       if (chrome.commands &&
           chrome.commands.onCommand.hasListener(this.onGotCommand))
         chrome.commands.onCommand.removeListener(this.onGotCommand);
       chrome.accessibilityPrivate.setKeyboardListener(false, false);
-
-      if (cvox.ChromeVox.isChromeOS)
-        chrome.accessibilityPrivate.setFocusRing([]);
+      chrome.accessibilityPrivate.setFocusRing([]);
     } else {
       if (chrome.commands &&
           !chrome.commands.onCommand.hasListener(this.onGotCommand))
         chrome.commands.onCommand.addListener(this.onGotCommand);
         chrome.accessibilityPrivate.setKeyboardListener(
             true, cvox.ChromeVox.isStickyPrefOn);
     }
 
     // note that |this.currentRange_| can *change* because the request is
     // async. Save it to ensure we're looking at the currentRange at this moment
@@ skipping 14 matching lines @@
         // If we're focused in the desktop tree, do nothing.
         if (cur && !cur.isWebRange())
           return;
 
         // If we're entering compat mode or next mode for just one tab,
         // disable Classic for that tab only.
         this.disableClassicChromeVox_(tabs);
       }
     }.bind(this));
 
-    // If switching out of a ChromeVox Next mode, make sure we cancel
-    // the progress loading sound just in case.
+    // Switching into either compat or classic.
     if (oldMode === ChromeVoxMode.NEXT ||
-        oldMode === ChromeVoxMode.FORCE_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();
+    }
 
+    // Switching out of next, force next, or uninitialized (on startup).
     if (newMode === ChromeVoxMode.NEXT ||
         newMode === ChromeVoxMode.FORCE_NEXT) {
       (new PanelCommand(PanelCommandType.ENABLE_MENUS)).send();
       if (cvox.TabsApiHandler)
         cvox.TabsApiHandler.shouldOutputSpeechAndBraille = false;
+
+      window['prefs'].switchToKeyMap('keymap_next');
     } else {
-      (new PanelCommand(PanelCommandType.DISABLE_MENUS)).send();
+      // |newMode| is either classic or compat.
       if (cvox.TabsApiHandler)
         cvox.TabsApiHandler.shouldOutputSpeechAndBraille = true;
+
+      // Moving from next to classic/compat should be the only case where
+      // keymaps get reset. Note the classic <-> compat switches should preserve
+      // keymaps especially if a user selected a different one.
+      if (oldMode &&
+          oldMode != ChromeVoxMode.CLASSIC &&
+          oldMode != ChromeVoxMode.COMPAT) {
+        // The user's configured key map gets wiped here; this is consistent
+        // with previous behavior when switching keymaps.
+        window['prefs'].switchToKeyMap('keymap_next');
+      }
     }
   },
 
   /**
    * Toggles between force next and classic/compat modes.
    * This toggle automatically handles deciding between classic/compat based on
    * the start of the current range.
    * @param {boolean=} opt_setValue Directly set to force next (true) or
    *                                classic/compat (false).
    * @return {boolean} True to announce current position.
@@ skipping 911 matching lines @@
   return new RegExp('^(' + globs.map(function(glob) {
     return glob.replace(/[.+^$(){}|[\]\\]/g, '\\$&')
         .replace(/\*/g, '.*')
         .replace(/\?/g, '.');
   }).join('|') + ')$');
 };
 
 new Background();
 
 });  // goog.scope