Merge dom node and node unit types.

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

 // Copyright 2016 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 ChromeVox commands.
  */
 
 goog.provide('CommandHandler');
 
@@ skipping 296 matching lines @@
       pred = AutomationPredicate.visitedLink;
       predErrorMsg = 'no_next_visited_link';
       break;
     case 'previousVisitedLink':
       dir = Dir.BACKWARD;
       pred = AutomationPredicate.visitedLink;
       predErrorMsg = 'no_previous_visited_link';
       break;
     case 'right':
     case 'nextObject':
-      current = current.move(cursors.Unit.DOM_NODE, Dir.FORWARD);
+      current = current.move(cursors.Unit.NODE, Dir.FORWARD);
       break;
     case 'left':
     case 'previousObject':
-      current = current.move(cursors.Unit.DOM_NODE, Dir.BACKWARD);
+      current = current.move(cursors.Unit.NODE, Dir.BACKWARD);
       break;
     case 'jumpToTop':
       var node = AutomationUtil.findNodePost(
           current.start.node.root, Dir.FORWARD, AutomationPredicate.leaf);
     if (node)
       current = cursors.Range.fromNode(node);
       break;
     case 'jumpToBottom':
       var node = AutomationUtil.findNodePost(
           current.start.node.root, Dir.BACKWARD, AutomationPredicate.leaf);
@@ skipping 13 matching lines @@
     case 'readFromHere':
       ChromeVoxState.isReadingContinuously = true;
       var continueReading = function() {
         if (!ChromeVoxState.isReadingContinuously ||
             !ChromeVoxState.instance.currentRange_)
           return;
 
         var prevRange = ChromeVoxState.instance.currentRange_;
         var newRange =
             ChromeVoxState.instance.currentRange_.move(
-                cursors.Unit.DOM_NODE, Dir.FORWARD);
+                cursors.Unit.NODE, Dir.FORWARD);
 
         // Stop if we've wrapped back to the document.
         var maybeDoc = newRange.start.node;
         if (maybeDoc.role == RoleType.rootWebArea &&
             maybeDoc.parent.root.role == RoleType.desktop) {
           ChromeVoxState.isReadingContinuously = false;
           return;
         }
 
         ChromeVoxState.instance.setCurrentRange(newRange);
@@ skipping 177 matching lines @@
       break;
   }
   if (announcement) {
     cvox.ChromeVox.tts.speak(
         announcement, cvox.QueueMode.FLUSH,
         cvox.AbstractTts.PERSONALITY_ANNOTATION);
   }
 };
 
 }); //  goog.scope