Bug 648511 - Firefox plugin scan doesn't find full Acrobat installation, only Acrobat reader, r=bsmedberg
authorDave Huang <khym@azeotrope.org>
Fri, 08 Apr 2011 13:57:24 -0700
changeset 67689 851fc65d2f5548fee0f6e673802a698bc5fdbc25
parent 67688 6c73db2ca7cc1442fec5b83dae4818a4ea8de41b
child 67690 c1ef3c3740cb313db324c51ba3aa47a77186b797
push id19413
push userbsmedberg@mozilla.com
push dateFri, 08 Apr 2011 20:59:09 +0000
treeherdermozilla-central@851fc65d2f55 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs648511
milestone2.2a1pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 648511 - Firefox plugin scan doesn't find full Acrobat installation, only Acrobat reader, r=bsmedberg
modules/plugin/base/src/nsPluginDirServiceProvider.cpp
--- a/modules/plugin/base/src/nsPluginDirServiceProvider.cpp
+++ b/modules/plugin/base/src/nsPluginDirServiceProvider.cpp
@@ -428,17 +428,17 @@ nsPluginDirServiceProvider::GetFile(cons
 
     nsAutoString newestPath;
 
     rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_LOCAL_MACHINE,
                       NS_LITERAL_STRING("software\\Adobe\\Acrobat Reader"),
                       nsIWindowsRegKey::ACCESS_READ);
     if (NS_FAILED(rv)) {
       rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_LOCAL_MACHINE,
-                        NS_LITERAL_STRING("software\\Adobe\\Adobe Reader"),
+                        NS_LITERAL_STRING("software\\Adobe\\Adobe Acrobat"),
                         nsIWindowsRegKey::ACCESS_READ);
       if (NS_FAILED(rv)) {
         return NS_ERROR_FAILURE;
       }
     }
 
     // We must enumerate through the keys because what if there is
     // more than one version?