diff options
| author | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 17:37:12 +0000 |
|---|---|---|
| committer | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 17:37:12 +0000 |
| commit | b83ff229cfe2c15a6dab2278acf7d328645470a5 (patch) | |
| tree | a1b9183bbb3c9aaa91364b5e15c22115336b9786 /chrome/browser/chromeos/gview_request_interceptor.cc | |
| parent | 77d13338e12da7ac2c177f4da53b9293850ff357 (diff) | |
| download | chromium_src-b83ff229cfe2c15a6dab2278acf7d328645470a5.zip chromium_src-b83ff229cfe2c15a6dab2278acf7d328645470a5.tar.gz chromium_src-b83ff229cfe2c15a6dab2278acf7d328645470a5.tar.bz2 | |
Refactor the plugin lists handling code.
Effects of this refactor:
1. The WebPluginInfo now keep information not only if a plugin is disabled but also the reason for that. It can either be user, policy or both. That way we can restore the right value after policies stop to control the feature.
2. Plugins can be correctly enabled and disabled either as a group or separately.
3. The code is cleaner and PluginGroup is not duplicating information from PluginList but stores all needed information and provides it through cleaner interface.
BUG=54681,66505,69374,69148
TEST=Manual for the policy. DefaultPluginUITest.DefaultPluginLoadTest from ui_tests and Plugin* from test_shell_tests.
Review URL: http://codereview.chromium.org/5699005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72341 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/gview_request_interceptor.cc')
| -rw-r--r-- | chrome/browser/chromeos/gview_request_interceptor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/gview_request_interceptor.cc b/chrome/browser/chromeos/gview_request_interceptor.cc index 5e5c521..c6b1f9c 100644 --- a/chrome/browser/chromeos/gview_request_interceptor.cc +++ b/chrome/browser/chromeos/gview_request_interceptor.cc @@ -67,7 +67,7 @@ net::URLRequestJob* GViewRequestInterceptor::MaybeInterceptResponse( PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path); if (webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath( pdf_path, &info) && - info.enabled) + webkit::npapi::IsPluginEnabled(info)) return NULL; } // If supported, build the URL to the Google Document Viewer |