diff options
| author | rniwa@chromium.org <rniwa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-22 03:25:54 +0000 |
|---|---|---|
| committer | rniwa@chromium.org <rniwa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-22 03:25:54 +0000 |
| commit | c3ffe1e34295c3d741909e50e7273225692788ce (patch) | |
| tree | 0677e16e9b5e2779be73459a913b3b80e62b6072 /chrome/browser | |
| parent | 6852d7d96f3643277e8dab49e3bfa0e482aafffe (diff) | |
| download | chromium_src-c3ffe1e34295c3d741909e50e7273225692788ce.zip chromium_src-c3ffe1e34295c3d741909e50e7273225692788ce.tar.gz chromium_src-c3ffe1e34295c3d741909e50e7273225692788ce.tar.bz2 | |
Revert 72238 because this commit seems to have caused perms check on Linux Builder to fail.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6254007
TBR=chaitanyag@chromium.org
Review URL: http://codereview.chromium.org/6275015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 2 | ||||
| -rw-r--r-- | chrome/browser/profiles/profile_impl.cc | 14 | ||||
| -rwxr-xr-x | chrome/browser/resources/access_chromevox/manifest.json | 26 |
3 files changed, 0 insertions, 42 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 907deb4..46cb09e 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -101,8 +101,6 @@ without changes to the corresponding grd file. etaa --> <include name="IDR_NETWORK_MENU_JS" file="resources\network_menu.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" flattenhtml="true" type="BINDATA" /> - <!-- manifest file of ChromeVox accessibility extension --> - <include name="IDR_CHROMEVOX_MANIFEST" file="resources\access_chromevox\manifest.json" type="BINDATA" /> </if> </includes> </release> diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 01cd530..1204af0 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -402,20 +402,6 @@ void ProfileImpl::RegisterComponentExtensions() { extensions_service_->register_component_extension( ExtensionService::ComponentExtensionInfo(manifest, path)); } - -#if defined(OS_CHROMEOS) - // Register access extensions only if accessibility is enabled. - if (g_browser_process->local_state()-> - GetBoolean(prefs::kAccessibilityEnabled)) { - FilePath path = FilePath(extension_misc::kAccessExtensionPath) - .AppendASCII("access_chromevox"); - std::string manifest = - ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_CHROMEVOX_MANIFEST).as_string(); - extensions_service_->register_component_extension( - ExtensionService::ComponentExtensionInfo(manifest, path)); - } -#endif } void ProfileImpl::InstallDefaultApps() { diff --git a/chrome/browser/resources/access_chromevox/manifest.json b/chrome/browser/resources/access_chromevox/manifest.json deleted file mode 100755 index 224d76b..0000000 --- a/chrome/browser/resources/access_chromevox/manifest.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDltVl1k15pjRzuZfMc3B69inxwm2bZeZ2O8/zFO+NluHnBm3GJ3fzdOoFGJd+M16I8p7zxxQyHeDMfWYASyCeB8XnUEDKjqNLQfCnncsANzHsYoEbYj2nEUML2P13b9q+AAvpCBpAJ4cZp81e9n1y/vbSXHE4385cgkKueItzikQIDAQAB", - "name": "ChromeVox", - "version": "1.0", - "description": "ChromeVox - Giving Voice to Chrome.", - "background_page": "chromevox/background/background.html", - "permissions": [ - "bookmarks", - "tabs", - "experimental", - "http://*/", - "https://*/" - ], - "content_scripts": [ - { - "matches": [ "<all_urls>" ], - "all_frames": true, - "js": [ - "build/build_defs.js", - "build/build_config_chrome.js", - "chromevox/injected/main.js", - "common/extension_bridge.js" - ] - } - ] -} |