Add remaining text/caret navigation commands to ChromeVox 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');
 goog.provide('global');
 
 goog.require('AutomationPredicate');
 goog.require('AutomationUtil');
+goog.require('Output');
 goog.require('cursors.Cursor');
 goog.require('cvox.TabsApiHandler');
 
 goog.scope(function() {
 var AutomationNode = chrome.automation.AutomationNode;
 var Dir = AutomationUtil.Dir;
 var EventType = chrome.automation.EventType;
 
 /** Classic Chrome accessibility API. */
 global.accessibility =
@@ skipping 26 matching lines @@
    */
   this.currentRange_ = null;
 
   /**
    * Whether ChromeVox Next is active.
    * @type {boolean}
    * @private
    */
   this.active_ = false;
 
+  /**
+   * @type {!Output}
+   * @private
+   */
+  this.output_ = new Output();
+
   // Only needed with unmerged ChromeVox classic loaded before.
   global.accessibility.setAccessibilityEnabled(false);
 
   // Manually bind all functions to |this|.
   for (var func in this) {
     if (typeof(this[func]) == 'function')
       this[func] = this[func].bind(this);
   }
 
   /**
@@ skipping 66 matching lines @@
     var pred = null;
     switch (command) {
       case 'nextHeading':
         dir = Dir.FORWARD;
         pred = AutomationPredicate.heading;
         break;
       case 'previousHeading':
         dir = Dir.BACKWARD;
         pred = AutomationPredicate.heading;
         break;
+      case 'nextCharacter':
+        current = current.move(cursors.Unit.CHARACTER, Dir.FORWARD);
+        break;
+      case 'previousCharacter':
+        current = current.move(cursors.Unit.CHARACTER, Dir.BACKWARD);
+        break;
+      case 'nextWord':
+        current = current.move(cursors.Unit.WORD, Dir.FORWARD);
+        break;
+      case 'previousWord':
+        current = current.move(cursors.Unit.WORD, Dir.BACKWARD);
+        break;
       case 'nextLine':
         current = current.move(cursors.Unit.LINE, Dir.FORWARD);
         break;
       case 'previousLine':
         current = current.move(cursors.Unit.LINE, Dir.BACKWARD);
         break;
       case 'nextLink':
         dir = Dir.FORWARD;
         pred = AutomationPredicate.link;
         break;
@@ skipping 30 matching lines @@
 
       if (node)
         current = cursors.Range.fromNode(node);
     }
 
     if (current) {
       // TODO(dtseng): Figure out what it means to focus a range.
       current.getStart().getNode().focus();
 
       this.currentRange_ = current;
-      this.handleOutput(this.currentRange_);
+      this.output_.output(this.currentRange_);
     }
   },
 
   /**
    * Provides all feedback once ChromeVox's focus changes.
    * @param {Object} evt
    */
   onFocus: function(evt) {
     var node = evt.target;
     if (!node)
       return;
 
     this.currentRange_ = cursors.Range.fromNode(node);
-    this.handleOutput(this.currentRange_);
+    this.output_.output(this.currentRange_);
   },
 
   /**
    * Provides all feedback once a load complete event fires.
    * @param {Object} evt
    */
   onLoadComplete: function(evt) {
     if (this.currentRange_)
       return;
 
     var node = AutomationUtil.findNodePost(evt.target,
         Dir.FORWARD,
         AutomationPredicate.leaf);
     if (node)
       this.currentRange_ = cursors.Range.fromNode(node);
 
     if (this.currentRange_)
-      this.handleOutput(this.currentRange_);
+      this.output_.output(this.currentRange_);
   },
 
   /**
    * @private
    * @param {string} url
    * @return {boolean} Whether the given |url| is whitelisted.
    */
   isWhitelisted_: function(url) {
     return this.whitelist_.some(function(item) {
       return url.indexOf(item) != -1;
@@ skipping 81 matching lines @@
     cvox.ChromeVox.tts.speak(output, cvox.QueueMode.FLUSH);
     cvox.ChromeVox.braille.write(cvox.NavBraille.fromText(output));
     chrome.accessibilityPrivate.setFocusRing(nodeLocations);
   }
 };
 
 /** @type {Background} */
 global.backgroundObj = new Background();
 
 });  // goog.scope