diff options
| author | rvargas <rvargas@chromium.org> | 2014-11-07 17:44:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-08 01:44:44 +0000 |
| commit | b805615793e5ddcf7aae67f90672027d76857f29 (patch) | |
| tree | eb209c18577b32fedaa445ebd6ebd0e9e2ec6f6c | |
| parent | 03655fd3f6d72165dc3c9bd2c89807305316fe6c (diff) | |
| download | chromium_src-b805615793e5ddcf7aae67f90672027d76857f29.zip chromium_src-b805615793e5ddcf7aae67f90672027d76857f29.tar.gz chromium_src-b805615793e5ddcf7aae67f90672027d76857f29.tar.bz2 | |
Plugin service: Use the correct registry key for each watch operation.
6f315b85b9126cdbbeee5 master@{#300036} introduced a regression where the two
registry keys that are watched for changes to detect installation of NPAPI
plugins, were being mixed.
This CL fixes the issue... using the correct key each time a new StartWatching
is called.
BUG=428560
R=piman@chromium.org
Review URL: https://codereview.chromium.org/708933002
Cr-Commit-Position: refs/heads/master@{#303347}
| -rw-r--r-- | content/browser/plugin_service_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc index 176e80e..49b6638 100644 --- a/content/browser/plugin_service_impl.cc +++ b/content/browser/plugin_service_impl.cc @@ -200,7 +200,7 @@ void PluginServiceImpl::StartWatchingPlugins() { KEY_NOTIFY) == ERROR_SUCCESS) { base::win::RegKey::ChangeCallback callback = base::Bind(&PluginServiceImpl::OnKeyChanged, base::Unretained(this), - base::Unretained(&hkcu_key_)); + base::Unretained(&hklm_key_)); hklm_key_.StartWatching(callback); } #endif @@ -630,7 +630,7 @@ void PluginServiceImpl::GetPluginsOnIOThread( void PluginServiceImpl::OnKeyChanged(base::win::RegKey* key) { key->StartWatching(base::Bind(&PluginServiceImpl::OnKeyChanged, base::Unretained(this), - base::Unretained(&hkcu_key_))); + base::Unretained(key))); PluginList::Singleton()->RefreshPlugins(); PurgePluginListCache(NULL, false); |