diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-27 01:54:13 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-27 01:54:13 +0000 |
| commit | 6cc98d3acc9daaaf54feed2f439942196aff8852 (patch) | |
| tree | 6ec1b7f695bd2f33115b189a707537b17cbf208c | |
| parent | b2cc96d0f23779ed8b2491227d13cc8f984f4585 (diff) | |
| download | chromium_src-6cc98d3acc9daaaf54feed2f439942196aff8852.zip chromium_src-6cc98d3acc9daaaf54feed2f439942196aff8852.tar.gz chromium_src-6cc98d3acc9daaaf54feed2f439942196aff8852.tar.bz2 | |
Fix NPAPI registration
BUG=none
TEST=Set the persist NPAPI marker, upgrade GCF, then check to see if registration took place.
Review URL: http://codereview.chromium.org/5366003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67482 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome_frame/chrome_tab.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index 0b1ae30..d976e15 100644 --- a/chrome_frame/chrome_tab.cc +++ b/chrome_frame/chrome_tab.cc @@ -511,7 +511,7 @@ STDAPI DllRegisterServer() { BHO_CLSID | BHO_REGISTRATION; if (UtilIsPersistentNPAPIMarkerSet()) { - flags |= IDR_CHROMEFRAME_NPAPI; + flags |= NPAPI_PLUGIN; } HRESULT hr = CustomRegistration(flags, TRUE, true); @@ -534,7 +534,7 @@ STDAPI DllRegisterUserServer() { BHO_CLSID | BHO_REGISTRATION; if (UtilIsPersistentNPAPIMarkerSet()) { - flags |= IDR_CHROMEFRAME_NPAPI; + flags |= NPAPI_PLUGIN; } HRESULT hr = CustomRegistration(flags, TRUE, false); |