diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 20:39:14 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 20:39:14 +0000 |
| commit | b71ffc6c2a90e8dcf670fd7c7b6df8dca4ca50c3 (patch) | |
| tree | d5fe2133f84d7ec4dc788a8b47384313ac89e847 | |
| parent | 20c011b32824e396743f8dbbdf4de068b4bac294 (diff) | |
| download | chromium_src-b71ffc6c2a90e8dcf670fd7c7b6df8dca4ca50c3.zip chromium_src-b71ffc6c2a90e8dcf670fd7c7b6df8dca4ca50c3.tar.gz chromium_src-b71ffc6c2a90e8dcf670fd7c7b6df8dca4ca50c3.tar.bz2 | |
Look for Adobe Acrobat as well.
BUG=1583
Review URL: http://codereview.chromium.org/6293
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3124 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/plugins/plugin_list.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc index d86d14fe..e10bfc7 100644 --- a/webkit/glue/plugins/plugin_list.cc +++ b/webkit/glue/plugins/plugin_list.cc @@ -31,7 +31,8 @@ scoped_refptr<PluginList> PluginList::singleton_; static const TCHAR kRegistryApps[] = _T("Software\\Microsoft\\Windows\\CurrentVersion\\App Paths"); static const TCHAR kRegistryFirefox[] = _T("firefox.exe"); -static const TCHAR kRegistryAcrobat[] = _T("AcroRd32.exe"); +static const TCHAR kRegistryAcrobat[] = _T("Acrobat.exe"); +static const TCHAR kRegistryAcrobatReader[] = _T("AcroRd32.exe"); static const TCHAR kRegistryWindowsMedia[] = _T("wmplayer.exe"); static const TCHAR kRegistryQuickTime[] = _T("QuickTimePlayer.exe"); static const TCHAR kRegistryPath[] = _T("Path"); @@ -407,10 +408,13 @@ void PluginList::LoadFirefoxPlugins() { void PluginList::LoadAcrobatPlugins() { std::wstring path; - if (GetInstalledPath(kRegistryAcrobat, &path)) { - path.append(L"\\Browser"); - LoadPlugins(path); + if (!GetInstalledPath(kRegistryAcrobatReader, &path) && + !GetInstalledPath(kRegistryAcrobat, &path)) { + return; } + + path.append(L"\\Browser"); + LoadPlugins(path); } void PluginList::LoadQuicktimePlugins() { |