ChromeVox migration from third_party: uncompiled files.

this CL does the following:
- Moves ChromeVox uncompiled files and assets from third_party to
  chrome/browser/resources/chromeos/chromevox.

- Adds OWNEERS and separate .gyp file for ChromeVox in the new location.

- Removes the uncompiled searchvox files.  They were misplaced and are
  compiled in.  These will be readded when moving all other
  ChromeVox javascript.


BUG=371692
R=dmazzoni@chromium.org,dtseng@chromium.org,darin@chromium.org

Review URL: https://codereview.chromium.org/272703004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270411 0039d316-1c4b-4281-b951-d872f2087c98

110 files changed, 198 insertions, 120 deletions

diff --git a/chrome/browser/resources/chromeos/chromevox/OWNERS b/chrome/browser/resources/chromeos/chromevox/OWNERS
new file mode 100644
index 0000000..dfab84a
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/OWNERS
@@ -0,0 +1,4 @@
+aboxhall@chromium.org
+dmazzoni@chromium.org
+dtseng@chromium.org
+plundblad@chromium.org
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox.gyp b/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
new file mode 100644
index 0000000..2e635b7
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
@@ -0,0 +1,179 @@
+# 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.
+
+{
+  'variables': {
+    'chromevox_dest_dir': '<(PRODUCT_DIR)/resources/chromeos/chromevox',
+  },
+  'targets': [
+    {
+      'target_name': 'chromevox_resources',
+      'type': 'none',
+      'dependencies': [
+        'chromevox_assets',
+        'chromevox_static_files',
+        'chromevox_strings',
+        'chromevox_uncompiled_js_files',
+        '<(DEPTH)/chrome/third_party/chromevox/chromevox.gyp:chromevox_third_party_resources',
+      ],
+      'conditions': [
+        ['disable_nacl==0 and disable_nacl_untrusted==0', {
+          'dependencies': [
+            '<(DEPTH)/third_party/liblouis/liblouis_nacl.gyp:liblouis_nacl_wrapper_nacl',
+          ],
+          }],
+      ],
+    },
+    {
+      'target_name': 'chromevox_assets',
+      'type': 'none',
+      'copies': [
+        {
+          'destination': '<(chromevox_dest_dir)/chromevox',
+          'files': [
+            'chromevox/chromevox-128.png',
+            'chromevox/chromevox-16.png',
+            'chromevox/chromevox-19.png',
+            'chromevox/chromevox-48.png',
+          ],
+        },
+        {
+          'destination': '<(chromevox_dest_dir)/chromevox/background/earcons',
+          'files': [
+            'chromevox/background/earcons/alert_modal.ogg',
+            'chromevox/background/earcons/alert_nonmodal.ogg',
+            'chromevox/background/earcons/bullet.ogg',
+            'chromevox/background/earcons/busy_progress_loop.ogg',
+            'chromevox/background/earcons/busy_working_loop.ogg',
+            'chromevox/background/earcons/button.ogg',
+            'chromevox/background/earcons/check_off.ogg',
+            'chromevox/background/earcons/check_on.ogg',
+            'chromevox/background/earcons/collapsed.ogg',
+            'chromevox/background/earcons/editable_text.ogg',
+            'chromevox/background/earcons/ellipsis.ogg',
+            'chromevox/background/earcons/expanded.ogg',
+            'chromevox/background/earcons/font_change.ogg',
+            'chromevox/background/earcons/invalid_keypress.ogg',
+            'chromevox/background/earcons/link.ogg',
+            'chromevox/background/earcons/listbox.ogg',
+            'chromevox/background/earcons/long_desc.ogg',
+            'chromevox/background/earcons/new_mail.ogg',
+            'chromevox/background/earcons/object_close.ogg',
+            'chromevox/background/earcons/object_delete.ogg',
+            'chromevox/background/earcons/object_deselect.ogg',
+            'chromevox/background/earcons/object_enter.ogg',
+            'chromevox/background/earcons/object_exit.ogg',
+            'chromevox/background/earcons/object_open.ogg',
+            'chromevox/background/earcons/object_select.ogg',
+            'chromevox/background/earcons/paragraph_break.ogg',
+            'chromevox/background/earcons/search_hit.ogg',
+            'chromevox/background/earcons/search_miss.ogg',
+            'chromevox/background/earcons/section.ogg',
+            'chromevox/background/earcons/selection.ogg',
+            'chromevox/background/earcons/selection_reverse.ogg',
+            'chromevox/background/earcons/special_content.ogg',
+            'chromevox/background/earcons/task_success.ogg',
+            'chromevox/background/earcons/wrap_edge.ogg',
+            'chromevox/background/earcons/wrap.ogg',
+          ],
+        },
+        {
+          'destination': '<(chromevox_dest_dir)/chromevox/background/keymaps',
+          'files': [
+            'chromevox/background/keymaps/classic_keymap.json',
+            'chromevox/background/keymaps/experimental.json',
+            'chromevox/background/keymaps/flat_keymap.json',
+          ],
+        },
+        {
+          'destination': '<(chromevox_dest_dir)/chromevox/background/mathmaps/functions',
+          'files': [
+            'chromevox/background/mathmaps/functions/algebra.json',
+            'chromevox/background/mathmaps/functions/elementary.json',
+            'chromevox/background/mathmaps/functions/hyperbolic.json',
+            'chromevox/background/mathmaps/functions/trigonometry.json',
+          ],
+        },
+        {
+          'destination': '<(chromevox_dest_dir)/chromevox/background/mathmaps/symbols',
+          'files': [
+            'chromevox/background/mathmaps/symbols/greek-capital.json',
+            'chromevox/background/mathmaps/symbols/greek-mathfonts.json',
+            'chromevox/background/mathmaps/symbols/greek-scripts.json',
+            'chromevox/background/mathmaps/symbols/greek-small.json',
+            'chromevox/background/mathmaps/symbols/greek-symbols.json',
+            'chromevox/background/mathmaps/symbols/hebrew_letters.json',
+            'chromevox/background/mathmaps/symbols/latin-lower-double-accent.json',
+            'chromevox/background/mathmaps/symbols/latin-lower-normal.json',
+            'chromevox/background/mathmaps/symbols/latin-lower-phonetic.json',
+            'chromevox/background/mathmaps/symbols/latin-lower-single-accent.json',
+            'chromevox/background/mathmaps/symbols/latin-mathfonts.json',
+            'chromevox/background/mathmaps/symbols/latin-rest.json',
+            'chromevox/background/mathmaps/symbols/latin-upper-double-accent.json',
+            'chromevox/background/mathmaps/symbols/latin-upper-normal.json',
+            'chromevox/background/mathmaps/symbols/latin-upper-single-accent.json',
+            'chromevox/background/mathmaps/symbols/math_angles.json',
+            'chromevox/background/mathmaps/symbols/math_arrows.json',
+            'chromevox/background/mathmaps/symbols/math_characters.json',
+            'chromevox/background/mathmaps/symbols/math_delimiters.json',
+            'chromevox/background/mathmaps/symbols/math_digits.json',
+            'chromevox/background/mathmaps/symbols/math_geometry.json',
+            'chromevox/background/mathmaps/symbols/math_harpoons.json',
+            'chromevox/background/mathmaps/symbols/math_non_characters.json',
+            'chromevox/background/mathmaps/symbols/math_symbols.json',
+            'chromevox/background/mathmaps/symbols/math_whitespace.json',
+            'chromevox/background/mathmaps/symbols/other_stars.json',
+          ],
+        },
+      ],
+    },
+    {
+      'target_name': 'chromevox_static_files',
+      'type': 'none',
+      'copies': [
+        {
+          'destination': '<(chromevox_dest_dir)/chromevox/background',
+          'files': [
+            'chromevox/background/background.html',
+            'chromevox/background/kbexplorer.html',
+            'chromevox/background/options.html',
+          ],
+        },
+      ],
+    },
+    {
+      # JavaScript that are always directly included into the destination
+      # driectory.
+      'target_name': 'chromevox_uncompiled_js_files',
+      'type': 'none',
+      'copies': [
+        {
+          'destination': '<(chromevox_dest_dir)/chromevox/injected',
+          'files': [
+            'chromevox/injected/api.js',
+            'chromevox/injected/api_util.js',
+          ],
+        },
+      ],
+    },
+    {
+      'target_name': 'chromevox_strings',
+      'type': 'none',
+      'actions': [
+        {
+          'action_name': 'chromevox_strings',
+          'variables': {
+            'grit_grd_file': 'strings/chromevox_strings.grd',
+            # TODO(plundblad): Change to use PRODUCT_DIR when we have
+            # translations.
+            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/resources/chromeos/chromevox',
+            # We don't generate any RC files, so no resource_ds file is needed.
+            'grit_resource_ids': '',
+          },
+          'includes': [ '../../../../../build/grit_action.gypi' ],
+        },
+      ],
+    },
+  ],
+}
diff --git a/chrome/third_party/chromevox/chromevox/background/background.html b/chrome/browser/resources/chromeos/chromevox/chromevox/background/background.html
index ede68f2..ede68f2 100644
--- a/chrome/third_party/chromevox/chromevox/background/background.html
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/background.html
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/alert_modal.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/alert_modal.ogg
new file mode 100644
index 0000000..371b546
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/alert_modal.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/alert_nonmodal.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/alert_nonmodal.ogg
new file mode 100644
index 0000000..213a653
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/alert_nonmodal.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/bullet.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/bullet.ogg
new file mode 100644
index 0000000..bbd5b71
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/bullet.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/busy_progress_loop.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/busy_progress_loop.ogg
new file mode 100644
index 0000000..845c04da
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/busy_progress_loop.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/busy_working_loop.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/busy_working_loop.ogg
new file mode 100644
index 0000000..ad3cc0e
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/busy_working_loop.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/button.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/button.ogg
new file mode 100644
index 0000000..27cb3ae
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/button.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/check_off.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/check_off.ogg
new file mode 100644
index 0000000..bef9788
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/check_off.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/check_on.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/check_on.ogg
new file mode 100644
index 0000000..8999c26
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/check_on.ogg
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/collapsed.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/collapsed.ogg
index 457710f..4f25d4d 100644
--- a/chrome/third_party/chromevox/chromevox/background/earcons/collapsed.ogg
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/collapsed.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/editable_text.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/editable_text.ogg
new file mode 100644
index 0000000..2abbbd2
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/editable_text.ogg
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/ellipsis.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/ellipsis.ogg
index e4e4a2b..f64c9f0 100644
--- a/chrome/third_party/chromevox/chromevox/background/earcons/ellipsis.ogg
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/ellipsis.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/expanded.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/expanded.ogg
new file mode 100644
index 0000000..818a90b
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/expanded.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/font_change.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/font_change.ogg
new file mode 100644
index 0000000..fb8348c
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/font_change.ogg
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/invalid_keypress.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/invalid_keypress.ogg
index 292cefd..366d8ad 100644
--- a/chrome/third_party/chromevox/chromevox/background/earcons/invalid_keypress.ogg
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/invalid_keypress.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/link.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/link.ogg
new file mode 100644
index 0000000..eead5a6
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/link.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/listbox.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/listbox.ogg
new file mode 100644
index 0000000..9e1274a
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/listbox.ogg
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/long_desc.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/long_desc.ogg
index f4e6220..856067d 100644
--- a/chrome/third_party/chromevox/chromevox/background/earcons/long_desc.ogg
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/long_desc.ogg
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/new_mail.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/new_mail.ogg
index f4e6220..856067d 100644
--- a/chrome/third_party/chromevox/chromevox/background/earcons/new_mail.ogg
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/new_mail.ogg
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/object_close.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_close.ogg
index 0ec8552..43fb6f3 100644
--- a/chrome/third_party/chromevox/chromevox/background/earcons/object_close.ogg
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_close.ogg
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/object_delete.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_delete.ogg
index 54cbcd8..2670bf5 100644
--- a/chrome/third_party/chromevox/chromevox/background/earcons/object_delete.ogg
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_delete.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_deselect.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_deselect.ogg
new file mode 100644
index 0000000..e3288c4
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_deselect.ogg
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/object_enter.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_enter.ogg
index cd7dedc..aebc7aa 100644
--- a/chrome/third_party/chromevox/chromevox/background/earcons/object_enter.ogg
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_enter.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_exit.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_exit.ogg
new file mode 100644
index 0000000..bdf8189
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_exit.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_open.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_open.ogg
new file mode 100644
index 0000000..797a3d3
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_open.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_select.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_select.ogg
new file mode 100644
index 0000000..e3288c4
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/object_select.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/paragraph_break.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/paragraph_break.ogg
new file mode 100644
index 0000000..1bf4798
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/paragraph_break.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/search_hit.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/search_hit.ogg
new file mode 100644
index 0000000..3bf0dc9
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/search_hit.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/search_miss.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/search_miss.ogg
new file mode 100644
index 0000000..419aa415
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/search_miss.ogg
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/section.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/section.ogg
index 2102a91..1315ad4 100644
--- a/chrome/third_party/chromevox/chromevox/background/earcons/section.ogg
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/section.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/selection.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/selection.ogg
new file mode 100644
index 0000000..ea36f00
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/selection.ogg
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/selection_reverse.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/selection_reverse.ogg
index 8b04e73..d998abd 100644
--- a/chrome/third_party/chromevox/chromevox/background/earcons/selection_reverse.ogg
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/selection_reverse.ogg
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/special_content.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/special_content.ogg
index da293f7..e3807f3 100644
--- a/chrome/third_party/chromevox/chromevox/background/earcons/special_content.ogg
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/special_content.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/task_success.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/task_success.ogg
new file mode 100644
index 0000000..5902075
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/task_success.ogg
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/wrap.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/wrap.ogg
index edff255..bf05122 100644
--- a/chrome/third_party/chromevox/chromevox/background/earcons/wrap.ogg
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/wrap.ogg
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/wrap_edge.ogg b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/wrap_edge.ogg
new file mode 100644
index 0000000..fd2a3d4
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/earcons/wrap_edge.ogg
diff --git a/chrome/third_party/chromevox/chromevox/background/kbexplorer.html b/chrome/browser/resources/chromeos/chromevox/chromevox/background/kbexplorer.html
index 2770cd0..f45ccbc 100644
--- a/chrome/third_party/chromevox/chromevox/background/kbexplorer.html
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/kbexplorer.html
@@ -1,4 +1,4 @@
-<!-- Copyright (c) 2011 The Chromium Authors. All rights reserved.
+<!-- 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. -->
 <html>
diff --git a/chrome/third_party/chromevox/chromevox/background/keymaps/classic_keymap.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/keymaps/classic_keymap.json
index 23afe78..23afe78 100644
--- a/chrome/third_party/chromevox/chromevox/background/keymaps/classic_keymap.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/keymaps/classic_keymap.json
diff --git a/chrome/third_party/chromevox/chromevox/background/keymaps/experimental.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/keymaps/experimental.json
index 37090b7..37090b7 100644
--- a/chrome/third_party/chromevox/chromevox/background/keymaps/experimental.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/keymaps/experimental.json
diff --git a/chrome/third_party/chromevox/chromevox/background/keymaps/flat_keymap.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/keymaps/flat_keymap.json
index a6cee02..a6cee02 100644
--- a/chrome/third_party/chromevox/chromevox/background/keymaps/flat_keymap.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/keymaps/flat_keymap.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/functions/algebra.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/functions/algebra.json
index c3d01c1..c3d01c1 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/functions/algebra.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/functions/algebra.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/functions/elementary.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/functions/elementary.json
index 8628074..8628074 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/functions/elementary.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/functions/elementary.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/functions/hyperbolic.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/functions/hyperbolic.json
index 507a34a..507a34a 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/functions/hyperbolic.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/functions/hyperbolic.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/functions/trigonometry.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/functions/trigonometry.json
index 2c4d2b7..2c4d2b7 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/functions/trigonometry.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/functions/trigonometry.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/greek-capital.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/greek-capital.json
index b9bcfcf..b9bcfcf 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/greek-capital.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/greek-capital.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/greek-mathfonts.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/greek-mathfonts.json
index 073a886..073a886 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/greek-mathfonts.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/greek-mathfonts.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/greek-scripts.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/greek-scripts.json
index bd5e4d1..bd5e4d1 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/greek-scripts.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/greek-scripts.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/greek-small.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/greek-small.json
index 2816f03..2816f03 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/greek-small.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/greek-small.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/greek-symbols.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/greek-symbols.json
index d5bbd2e..d5bbd2e 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/greek-symbols.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/greek-symbols.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/hebrew_letters.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/hebrew_letters.json
index dfa863b..dfa863b 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/hebrew_letters.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/hebrew_letters.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-lower-double-accent.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-lower-double-accent.json
index 8a241c2..8a241c2 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-lower-double-accent.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-lower-double-accent.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-lower-normal.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-lower-normal.json
index 0504d7b..0504d7b 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-lower-normal.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-lower-normal.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-lower-phonetic.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-lower-phonetic.json
index 7f7709f..7f7709f 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-lower-phonetic.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-lower-phonetic.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-lower-single-accent.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-lower-single-accent.json
index 825ba13..825ba13 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-lower-single-accent.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-lower-single-accent.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-mathfonts.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-mathfonts.json
index 9adf11e..9adf11e 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-mathfonts.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-mathfonts.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-rest.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-rest.json
index bc82090..bc82090 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-rest.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-rest.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-upper-double-accent.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-upper-double-accent.json
index 5966a1e..5966a1e 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-upper-double-accent.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-upper-double-accent.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-upper-normal.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-upper-normal.json
index b3fcb4b..b3fcb4b 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-upper-normal.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-upper-normal.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-upper-single-accent.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-upper-single-accent.json
index d538752..d538752 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/latin-upper-single-accent.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/latin-upper-single-accent.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_angles.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_angles.json
index fd9192d..fd9192d 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_angles.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_angles.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_arrows.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_arrows.json
index 0c21734..0c21734 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_arrows.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_arrows.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_characters.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_characters.json
index cd94688..cd94688 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_characters.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_characters.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_delimiters.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_delimiters.json
index 0773abe..0773abe 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_delimiters.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_delimiters.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_digits.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_digits.json
index ac0adcc..ac0adcc 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_digits.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_digits.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_geometry.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_geometry.json
index d2e158c..d2e158c 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_geometry.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_geometry.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_harpoons.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_harpoons.json
index efb9297..efb9297 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_harpoons.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_harpoons.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_non_characters.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_non_characters.json
index bf17090..bf17090 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_non_characters.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_non_characters.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_symbols.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_symbols.json
index fd243b7..fd243b7 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_symbols.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_symbols.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_whitespace.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_whitespace.json
index acacc36..acacc36 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/math_whitespace.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/math_whitespace.json
diff --git a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/other_stars.json b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/other_stars.json
index 23b96aa..23b96aa 100644
--- a/chrome/third_party/chromevox/chromevox/background/mathmaps/symbols/other_stars.json
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/mathmaps/symbols/other_stars.json
diff --git a/chrome/third_party/chromevox/chromevox/background/options.html b/chrome/browser/resources/chromeos/chromevox/chromevox/background/options.html
index 7ebd1f0..8c938fa 100644
--- a/chrome/third_party/chromevox/chromevox/background/options.html
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/options.html
@@ -1,4 +1,4 @@
-<!-- Copyright (c) 2010 The Chromium Authors. All rights reserved.
+<!-- 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. -->
 <html>
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/chromevox-128.png b/chrome/browser/resources/chromeos/chromevox/chromevox/chromevox-128.png
new file mode 100644
index 0000000..e64e20a
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/chromevox-128.png
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/chromevox-16.png b/chrome/browser/resources/chromeos/chromevox/chromevox/chromevox-16.png
new file mode 100644
index 0000000..6b665aa2
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/chromevox-16.png
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/chromevox-19.png b/chrome/browser/resources/chromeos/chromevox/chromevox/chromevox-19.png
new file mode 100644
index 0000000..39a9605
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/chromevox-19.png
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/chromevox-48.png b/chrome/browser/resources/chromeos/chromevox/chromevox/chromevox-48.png
new file mode 100644
index 0000000..53f4073
--- /dev/null
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/chromevox-48.png
diff --git a/chrome/third_party/chromevox/chromevox/injected/api.js b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/api.js
index a584762..e74a886 100644
--- a/chrome/third_party/chromevox/chromevox/injected/api.js
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/api.js
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/third_party/chromevox/chromevox/injected/api_util.js b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/api_util.js
index 7eddd2f..606000b 100644
--- a/chrome/third_party/chromevox/chromevox/injected/api_util.js
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/api_util.js
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 57e0801..adc3439 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -123,8 +123,7 @@
             },
           ],
           'dependencies': [
-            '../chrome/third_party/chromevox/chromevox.gyp:chromevox_resources',
-            'chromevox_strings',
+            'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox_resources',
           ],
         }],
       ],
@@ -537,23 +536,5 @@
         },
       ],
     },
-    {
-      'target_name': 'chromevox_strings',
-      'type': 'none',
-      'actions': [
-        {
-          'action_name': 'chromevox_strings',
-          'variables': {
-            'grit_grd_file': 'browser/resources/chromeos/chromevox/strings/chromevox_strings.grd',
-            # TODO(plundblad): Change to use PRODUCT_DIR when we have
-            # translations.
-            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/resources/chromeos/chromevox',
-            # We don't generate any RC files, so no resource_ds file is needed.
-            'grit_resource_ids': '',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-      ],
-    },
   ], # targets
 }
diff --git a/chrome/third_party/chromevox/README.chromium b/chrome/third_party/chromevox/README.chromium
index 28824b0..dc97bcb 100644
--- a/chrome/third_party/chromevox/README.chromium
+++ b/chrome/third_party/chromevox/README.chromium
@@ -1,13 +1,15 @@
 Name: ChromeVox
 URL: http://code.google.com/p/google-axs-chrome/
 InfoURL: http://www.chromevox.com/
-Version: 1.31.0
+Version: 1.31.4
 License: Apache 2.0
 
 Description:
-ChromeVox is the screen reader for Chrome OS.
+ChromeVox is the screen reader for Chrome OS.  This directory contains pars of
+ChromeVox that haven't been migrated to
+chrome/browser/resources/chromeos/chromevox.
 
 Local Modifications: ChromeVox lives under trunk/chromevox/ in the upstream
 Google Code repository. The only modification is Chrome uses a different
-manifest. The one checked into the upstream repository can be safely ignored or
-deleted when merging.
+manifest. The one checked into the upstream repository should be deleted when
+merging.
diff --git a/chrome/third_party/chromevox/chromevox.gyp b/chrome/third_party/chromevox/chromevox.gyp
index a32b036..685cf7c 100644
--- a/chrome/third_party/chromevox/chromevox.gyp
+++ b/chrome/third_party/chromevox/chromevox.gyp
@@ -4,10 +4,10 @@
 
 {
   'conditions': [
-    ['chromeos==1 and disable_nacl==0 and disable_nacl_untrusted==0', {
+    ['chromeos==1', {
       'targets': [
         {
-          'target_name': 'chromevox_resources',
+          'target_name': 'chromevox_third_party_resources',
           'type': 'none',
           'copies': [
             {
@@ -19,85 +19,19 @@
                 'chromeVoxKbExplorerScript.js',
               ],
             },
-            {
-              'destination': '<(PRODUCT_DIR)/resources/chromeos/chromevox/chromevox',
-              'files': [
-                'chromevox/chromevox-128.png',
-                'chromevox/chromevox-16.png',
-                'chromevox/chromevox-19.png',
-                'chromevox/chromevox-48.png',
-              ],
-            },
+            # TODO(plundblad): Some of these css files are forks of
+            # cs from Chrome's web ui.  Consider consolidating those.
             {
               'destination': '<(PRODUCT_DIR)/resources/chromeos/chromevox/chromevox/background',
               'files': [
-                'chromevox/background/background.html',
                 'chromevox/background/chrome_shared2.css',
-                'chromevox/background/kbexplorer.html',
                 'chromevox/background/options.css',
-                'chromevox/background/options.html',
                 'chromevox/background/options_widgets.css',
               ],
             },
             {
-              'destination': '<(PRODUCT_DIR)/resources/chromeos/chromevox/chromevox/background/earcons',
-              'files': [
-                'chromevox/background/earcons/alert_modal.ogg',
-                'chromevox/background/earcons/alert_nonmodal.ogg',
-                'chromevox/background/earcons/bullet.ogg',
-                'chromevox/background/earcons/busy_progress_loop.ogg',
-                'chromevox/background/earcons/busy_working_loop.ogg',
-                'chromevox/background/earcons/button.ogg',
-                'chromevox/background/earcons/check_off.ogg',
-                'chromevox/background/earcons/check_on.ogg',
-                'chromevox/background/earcons/collapsed.ogg',
-                'chromevox/background/earcons/editable_text.ogg',
-                'chromevox/background/earcons/ellipsis.ogg',
-                'chromevox/background/earcons/expanded.ogg',
-                'chromevox/background/earcons/font_change.ogg',
-                'chromevox/background/earcons/invalid_keypress.ogg',
-                'chromevox/background/earcons/link.ogg',
-                'chromevox/background/earcons/listbox.ogg',
-                'chromevox/background/earcons/long_desc.ogg',
-                'chromevox/background/earcons/new_mail.ogg',
-                'chromevox/background/earcons/object_close.ogg',
-                'chromevox/background/earcons/object_delete.ogg',
-                'chromevox/background/earcons/object_deselect.ogg',
-                'chromevox/background/earcons/object_enter.ogg',
-                'chromevox/background/earcons/object_exit.ogg',
-                'chromevox/background/earcons/object_open.ogg',
-                'chromevox/background/earcons/object_select.ogg',
-                'chromevox/background/earcons/paragraph_break.ogg',
-                'chromevox/background/earcons/search_hit.ogg',
-                'chromevox/background/earcons/search_miss.ogg',
-                'chromevox/background/earcons/section.ogg',
-                'chromevox/background/earcons/selection.ogg',
-                'chromevox/background/earcons/selection_reverse.ogg',
-                'chromevox/background/earcons/special_content.ogg',
-                'chromevox/background/earcons/task_success.ogg',
-                'chromevox/background/earcons/wrap_edge.ogg',
-                'chromevox/background/earcons/wrap.ogg',
-              ],
-            },
-            {
-              'destination': '<(PRODUCT_DIR)/resources/chromeos/chromevox/chromevox/background/keymaps',
-              'files': [
-                'chromevox/background/keymaps/classic_keymap.json',
-                'chromevox/background/keymaps/experimental.json',
-                'chromevox/background/keymaps/flat_keymap.json',
-              ],
-            },
-            {
-              'destination': '<(PRODUCT_DIR)/resources/chromeos/chromevox/chromevox/background/',
-              'files': [
-                'chromevox/background/mathmaps/',
-              ],
-            },
-            {
               'destination': '<(PRODUCT_DIR)/resources/chromeos/chromevox/chromevox/injected',
               'files': [
-                'chromevox/injected/api.js',
-                'chromevox/injected/api_util.js',
                 'chromevox/injected/mathjax_external_util.js',
                 'chromevox/injected/mathjax.js',
               ],
@@ -116,9 +50,6 @@
               ],
             },
           ],
-          'dependencies': [
-            '../../../third_party/liblouis/liblouis_nacl.gyp:liblouis_nacl_wrapper_nacl',
-          ],
         },
       ],
     }],
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/alert_modal.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/alert_modal.ogg
deleted file mode 100644
index 6eb0f67..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/alert_modal.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/alert_nonmodal.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/alert_nonmodal.ogg
deleted file mode 100644
index baacacd..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/alert_nonmodal.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/bullet.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/bullet.ogg
deleted file mode 100644
index f810ab8..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/bullet.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/busy_progress_loop.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/busy_progress_loop.ogg
deleted file mode 100644
index e53f0dc..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/busy_progress_loop.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/busy_working_loop.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/busy_working_loop.ogg
deleted file mode 100644
index 4374d0b..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/busy_working_loop.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/button.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/button.ogg
deleted file mode 100644
index f0d4087..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/button.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/check_off.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/check_off.ogg
deleted file mode 100644
index 86f4fe9..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/check_off.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/check_on.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/check_on.ogg
deleted file mode 100644
index 9c718d0..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/check_on.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/editable_text.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/editable_text.ogg
deleted file mode 100644
index 4e4ea39..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/editable_text.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/expanded.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/expanded.ogg
deleted file mode 100644
index 5ef673a..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/expanded.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/font_change.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/font_change.ogg
deleted file mode 100644
index 012fb57..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/font_change.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/link.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/link.ogg
deleted file mode 100644
index 0615568..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/link.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/listbox.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/listbox.ogg
deleted file mode 100644
index 8267c0d..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/listbox.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/object_deselect.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/object_deselect.ogg
deleted file mode 100644
index b9fd70a..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/object_deselect.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/object_exit.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/object_exit.ogg
deleted file mode 100644
index f203078..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/object_exit.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/object_open.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/object_open.ogg
deleted file mode 100644
index d0a324c..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/object_open.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/object_select.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/object_select.ogg
deleted file mode 100644
index b9fd70a..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/object_select.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/paragraph_break.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/paragraph_break.ogg
deleted file mode 100644
index 708901a..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/paragraph_break.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/search_hit.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/search_hit.ogg
deleted file mode 100644
index 84237ce..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/search_hit.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/search_miss.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/search_miss.ogg
deleted file mode 100644
index 7a7b429..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/search_miss.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/selection.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/selection.ogg
deleted file mode 100644
index 95dde34..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/selection.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/task_success.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/task_success.ogg
deleted file mode 100644
index 40bc918..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/task_success.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/earcons/wrap_edge.ogg b/chrome/third_party/chromevox/chromevox/background/earcons/wrap_edge.ogg
deleted file mode 100644
index e16ad7d..0000000
--- a/chrome/third_party/chromevox/chromevox/background/earcons/wrap_edge.ogg
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/background/tests.html b/chrome/third_party/chromevox/chromevox/background/tests.html
deleted file mode 100644
index 3400664..0000000
--- a/chrome/third_party/chromevox/chromevox/background/tests.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-<title class="i18n" msgid="tests_page_title">ChromeVox Tests</title>
-
-<script type="text/javascript" src="../../closure/base.js"></script>
-<script type="text/javascript" src="../../deps.js"></script>
-
-<script type="text/javascript" src="tests.js"></script>
-<script type="text/javascript" src="../../chromeVoxTestsScript.js"></script>
-
-</head>
-<html>
-<body>
-
-<h1 class="i18n" msgid="tests_page_title">ChromeVox Tests</h1>
-
-
-</body>
-</html>
diff --git a/chrome/third_party/chromevox/chromevox/chromevox-128.png b/chrome/third_party/chromevox/chromevox/chromevox-128.png
deleted file mode 100644
index 4895f95..0000000
--- a/chrome/third_party/chromevox/chromevox/chromevox-128.png
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/chromevox-16.png b/chrome/third_party/chromevox/chromevox/chromevox-16.png
deleted file mode 100644
index 696fd05..0000000
--- a/chrome/third_party/chromevox/chromevox/chromevox-16.png
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/chromevox-19.png b/chrome/third_party/chromevox/chromevox/chromevox-19.png
deleted file mode 100644
index bec7030..0000000
--- a/chrome/third_party/chromevox/chromevox/chromevox-19.png
+++ /dev/null
diff --git a/chrome/third_party/chromevox/chromevox/chromevox-48.png b/chrome/third_party/chromevox/chromevox/chromevox-48.png
deleted file mode 100644
index 092a52f..0000000
--- a/chrome/third_party/chromevox/chromevox/chromevox-48.png
+++ /dev/null