summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authordtseng@google.com <dtseng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-05 00:26:15 +0000
committerdtseng@google.com <dtseng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-05 00:26:15 +0000
commit52ed04a8d3184f11437dd2e6b35a7a660135a69a (patch)
tree6a36b7f36b01246741e198c78d09742e7612bcc4 /chrome/browser
parent77f09ba1ab7ef106e3dbd6aa2a4c4ca15bb55c7b (diff)
downloadchromium_src-52ed04a8d3184f11437dd2e6b35a7a660135a69a.zip
chromium_src-52ed04a8d3184f11437dd2e6b35a7a660135a69a.tar.gz
chromium_src-52ed04a8d3184f11437dd2e6b35a7a660135a69a.tar.bz2
Moves the ChromeVox extension into the Chrome source tree.
BUG=309130 TEST=run ChromeVox on Aura. R=dmazzoni@chromium.org, erg@chromium.org, thakis@chromium.org, zelidrag@chromium.org Review URL: https://codereview.chromium.org/27748003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser_resources.grd2
-rwxr-xr-x[-rw-r--r--]chrome/browser/resources/chromeos/chromevox/manifest.json (renamed from chrome/browser/resources/chromeos/access_chromevox/manifest.json)0
2 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 0af1c8c..2fafc5f 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -299,7 +299,7 @@
<include name="IDR_CRYPTOHOME_HTML" file="resources\chromeos\cryptohome.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_CRYPTOHOME_JS" file="resources\chromeos\cryptohome.js" type="BINDATA" />
<!-- manifest file of ChromeVox accessibility extension -->
- <include name="IDR_CHROMEVOX_MANIFEST" file="resources\chromeos\access_chromevox\manifest.json" type="BINDATA" />
+ <include name="IDR_CHROMEVOX_MANIFEST" file="resources\chromeos\chromevox\manifest.json" type="BINDATA" />
<!-- manifest file of Connectivity Diagnostics app -->
<include name="IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST" file="resources\chromeos\connectivity_diagnostics\manifest.json" type="BINDATA" />
<include name="IDR_CONNECTIVITY_DIAGNOSTICS_LAUNCHER_MANIFEST" file="resources\chromeos\connectivity_diagnostics_launcher\manifest.json" type="BINDATA" />
diff --git a/chrome/browser/resources/chromeos/access_chromevox/manifest.json b/chrome/browser/resources/chromeos/chromevox/manifest.json
index f212d27..f212d27 100644..100755
--- a/chrome/browser/resources/chromeos/access_chromevox/manifest.json
+++ b/chrome/browser/resources/chromeos/chromevox/manifest.json