Inject CanAddURLToHistory into TopSitesImpl

chrome/browser/resources/chromeos/chromevox/cvox2/background/output.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 Provides output services for ChromeVox.
  */
 
 goog.provide('Output');
 goog.provide('Output.EventType');
@@ skipping 75 matching lines @@
     msgId: 'aria_role_alert',
     earcon: 'ALERT_NONMODAL',
   },
   button: {
     msgId: 'tag_button',
     earcon: 'BUTTON'
   },
   checkBox: {
     msgId: 'input_type_checkbox'
   },
+  date: {
+    msgId: 'input_type_date'
+  },
   dialog: {
     msgId: 'dialog'
   },
   heading: {
     msgId: 'aria_role_heading',
   },
   link: {
     msgId: 'tag_link',
     earcon: 'LINK'
   },
   listItem: {
     msgId: 'ARIA_ROLE_LISTITEM',
     earcon: 'list_item'
   },
   menuListOption: {
     msgId: 'aria_role_menuitem'
   },
   popUpButton: {
     msgId: 'tag_button'
   },
   radioButton: {
     msgId: 'input_type_radio'
   },
+  spinButton: {
+    msgId: 'aria_role_combobox',
+    earcon: 'LISTBOX'
+  },
   textBox: {
     msgId: 'input_type_text',
     earcon: 'EDITABLE_TEXT'
   },
   textField: {
     msgId: 'input_type_text',
     earcon: 'EDITABLE_TEXT'
   },
+  time: {
+    msgId: 'tag_time'
+  },
   toolbar: {
     msgId: 'aria_role_toolbar'
   }
 };
 
 /**
  * Metadata about supported automation states.
  * @const {!Object<string,
  *           {on: {msgId: string, earconId: string},
  *            off: {msgId: string, earconId: string}}>}
@@ skipping 12 matching lines @@
   }
 };
 
 /**
  * Rules specifying format of AutomationNodes for output.
  * @type {!Object<string, Object<string, Object<string, string>>>}
  */
 Output.RULES = {
   navigate: {
     'default': {
-      speak: '$name $value $role',
+      speak: '$name $value $description $help $role',
       braille: ''
     },
     alert: {
       speak: '!doNotInterrupt $role $descendants'
     },
     checkBox: {
       speak: '$name $role $checked'
     },
+    date: {
+      enter: '$name $role',
+      leave: '@exited_container($role)'
+    },
     dialog: {
       enter: '$name $role'
     },
     heading: {
       enter: '@tag_h+$hierarchicalLevel',
       speak: '@tag_h+$hierarchicalLevel $name='
     },
     inlineTextBox: {
       speak: '$value='
     },
@@ skipping 22 matching lines @@
     },
     popUpButton: {
       speak: '$value $name $role @aria_has_popup ' +
           '$if($collapsed, @aria_expanded_false, @aria_expanded_true)'
     },
     radioButton: {
       speak: '$if($checked, @describe_radio_selected($name), ' +
           '@describe_radio_unselected($name))'
     },
     slider: {
-      speak: '@describe_slider($value, $name)'
+      speak: '@describe_slider($value, $name) $help'
     },
     staticText: {
       speak: '$value $name'
     },
     tab: {
       speak: '@describe_tab($name)'
     },
+    textField: {
+      speak: '$name $value $if(' +
+          '$textInputType, @input_type_+$textInputType, @input_type_text) ' +
+          '$earcon(EDITABLE_TEXT)',
+      braille: ''
+    },
+    time: {
+      enter: '$name $role',
+      leave: '@exited_container($role)'
+    },
     toolbar: {
       enter: '$name $role'
     },
     window: {
       enter: '$name',
       speak: '@describe_window($name) $earcon(OBJECT_OPEN)'
     }
   },
   menuStart: {
     'default': {
@@ skipping 68 matching lines @@
  * Possible events handled by ChromeVox internally.
  * @enum {string}
  */
 Output.EventType = {
   NAVIGATE: 'navigate'
 };
 
 Output.prototype = {
   /**
    * Gets the output buffer for speech.
+   * @param {string=} opt_separator Used to join components of the output.
    * @return {!cvox.Spannable}
    */
-  toSpannable: function() {
+  toSpannable: function(opt_separator) {
+    opt_separator = opt_separator || '';
     return this.buffer_.reduce(function(prev, cur) {
+      if (prev === null)
+        return cur;
+      prev.append(opt_separator);
       prev.append(cur);
       return prev;
-    }, new cvox.Spannable());
+    }, null);
   },
 
   /**
+   * Gets the output buffer for speech with separator '|'.
+   * @return {!cvox.Spannable}
+   */
+  toSpannableForTest: function() {
+    return this.toSpannable('|');
+  },
+
+  /**
    * Specify ranges for speech.
    * @param {!cursors.Range} range
    * @param {cursors.Range} prevRange
    * @param {chrome.automation.EventType|Output.EventType} type
    * @return {!Output}
    */
   withSpeech: function(range, prevRange, type) {
     this.formatOptions_ = {speech: true, braille: false, location: true};
     this.render_(range, prevRange, type, this.buffer_);
     return this;
@@ skipping 203 matching lines @@
                   node.attributes.textSelEnd));
             }
           }
           // Annotate this as a name so we don't duplicate names from ancestors.
           if (node.role == chrome.automation.RoleType.inlineTextBox)
             token = 'name';
           options.annotation.push(token);
           this.append_(buff, text, options);
         } else if (token == 'indexInParent') {
           options.annotation.push(token);
-          this.append_(buff, node.indexInParent + 1);
+          this.append_(buff, String(node.indexInParent + 1));
         } else if (token == 'parentChildCount') {
           options.annotation.push(token);
           if (node.parent)
-          this.append_(buff, node.parent.children.length);
+          this.append_(buff, String(node.parent.children.length));
         } else if (token == 'state') {
           options.annotation.push(token);
           Object.getOwnPropertyNames(node.state).forEach(function(s) {
             this.append_(buff, s, options);
           }.bind(this));
         } else if (token == 'find') {
           // Find takes two arguments: JSON query string and format string.
           if (tree.firstChild) {
             var jsonQuery = tree.firstChild.value;
             node = node.find(
@@ skipping 313 matching lines @@
     }
 
     if (currentNode != root)
       throw 'Unbalanced parenthesis.';
 
     return root;
   }
 };
 
 });  // goog.scope