Revert of Fix ChromeVox Next compile.

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('cvox2.Background');
 goog.provide('cvox2.global');
 
 goog.require('cvox.TabsApiHandler');
 goog.require('cvox2.AutomationPredicates');
 goog.require('cvox2.AutomationUtil');
 goog.require('cvox2.Dir');
 
 /** Classic Chrome accessibility API. */
 cvox2.global.accessibility =
     chrome.accessibilityPrivate || chrome.experimental.accessibility;
 
 /**
  * ChromeVox2 background page.
- * @constructor
  */
 cvox2.Background = function() {
   /**
    * A list of site substring patterns to use with ChromeVox next. Keep these
    * strings relatively specific.
    * @type {!Array.<string>}
-   * @private
    */
   this.whitelist_ = ['http://www.chromevox.com/', 'chromevox_next_test'];
 
-  /**
-   * @type {cvox.TabsApiHandler}
-   * @private
-   */
+  /** @type {cvox.TabsApiHandler} @private */
   this.tabsHandler_ = new cvox.TabsApiHandler(cvox.ChromeVox.tts,
                                               cvox.ChromeVox.braille,
                                               cvox.ChromeVox.earcons);
 
-  /**
-   * @type {chrome.automation.AutomationNode}
-   * @private
-   */
+  /** @type {AutomationNode} @private */
   this.currentNode_ = null;
 
+  /** @type {cvox.TabsApiHandler} @private */
+  this.tabsHandler_ = new cvox.TabsApiHandler(cvox.ChromeVox.tts,
+                                              cvox.ChromeVox.braille,
+                                              cvox.ChromeVox.earcons);
+
   // Only needed with unmerged ChromeVox classic loaded before.
   cvox2.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);
   }
 
   // Register listeners for ...
@@ skipping 10 matching lines @@
    * @param {number} tabId
    * @param {Object} changeInfo
    */
   onTabUpdated: function(tabId, changeInfo) {
     chrome.tabs.get(tabId, function(tab) {
       if (!tab.url)
         return;
 
       if (!this.isWhitelisted_(tab.url)) {
         chrome.commands.onCommand.removeListener(this.onGotCommand);
-        cvox.ChromeVox.injectChromeVoxIntoTabs([tab], true);
+        cvox.ChromeVox.background.injectChromeVoxIntoTabs([tab], true);
         return;
       }
 
       if (!chrome.commands.onCommand.hasListeners())
         chrome.commands.onCommand.addListener(this.onGotCommand);
 
       this.disableClassicChromeVox_(tab.id);
 
       chrome.automation.getTree(this.onGotTree.bind(this));
     }.bind(this));
   },
 
   /**
    * Handles all setup once a new automation tree appears.
-   * @param {chrome.automation.AutomationNode} root
+   * @param {AutomationTree} tree The new automation tree.
    */
   onGotTree: function(root) {
     // Register all automation event listeners.
-    root.addEventListener('focus',
+    root.addEventListener(chrome.automation.EventType.focus,
                           this.onFocus,
                           true);
-    root.addEventListener('loadComplete',
+    root.addEventListener(chrome.automation.EventType.loadComplete,
                           this.onLoadComplete,
                           true);
 
     if (root.attributes.docLoaded)
       this.onLoadComplete({target: root});
   },
 
   /**
    * Handles chrome.commands.onCommand.
    * @param {string} command
@@ skipping 26 matching lines @@
         break;
       case 'nextLink':
         dir = cvox2.Dir.FORWARD;
         pred = cvox2.AutomationPredicates.link;
         break;
       case 'previousLink':
         dir = cvox2.Dir.BACKWARD;
         pred = cvox2.AutomationPredicates.link;
         break;
       case 'nextElement':
-        current = current.role == 'inlineTextBox' ?
+        current = current.role == chrome.automation.RoleType.inlineTextBox ?
             current.parent() : current;
         current = cvox2.AutomationUtil.findNextNode(current,
             cvox2.Dir.FORWARD,
             cvox2.AutomationPredicates.inlineTextBox);
         current = current ? current.parent() : current;
         break;
       case 'previousElement':
-        current = current.role == 'inlineTextBox' ?
+        current = current.role == chrome.automation.RoleType.inlineTextBox ?
             current.parent() : current;
         current = cvox2.AutomationUtil.findNextNode(current,
             cvox2.Dir.BACKWARD,
             cvox2.AutomationPredicates.inlineTextBox);
         current = current ? current.parent() : current;
         break;
     }
 
     if (pred)
       current = cvox2.AutomationUtil.findNextNode(current, dir, pred);
@@ skipping 57 matching lines @@
   disableClassicChromeVox_: function(tabId) {
     chrome.tabs.executeScript(
           tabId,
           {'code': 'try { window.disableChromeVox(); } catch(e) { }\n',
            'allFrames': true});
   }
 };
 
 /** @type {cvox2.Background} */
 cvox2.global.backgroundObj = new cvox2.Background();