diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 14:00:43 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 14:00:43 +0000 |
| commit | 88ca491d78b19e7b681943216483710322985fc5 (patch) | |
| tree | e1fe0286f7afff7c402db198ddc1c0b252c14079 /chrome/browser/chromeos/gview_request_interceptor.cc | |
| parent | 588be018436093781847593513ec1e5875a532db (diff) | |
| download | chromium_src-88ca491d78b19e7b681943216483710322985fc5.zip chromium_src-88ca491d78b19e7b681943216483710322985fc5.tar.gz chromium_src-88ca491d78b19e7b681943216483710322985fc5.tar.bz2 | |
Finish moving plugin probing out of process.
This moves all browser-side synchronous callers to use the asynchronous
PluginService interface.
BUG=17863,95114
TEST=Covered by tests. Plugins still work.
Review URL: http://codereview.chromium.org/8071013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105069 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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/gview_request_interceptor.cc b/chrome/browser/chromeos/gview_request_interceptor.cc index 730767f..70fa026 100644 --- a/chrome/browser/chromeos/gview_request_interceptor.cc +++ b/chrome/browser/chromeos/gview_request_interceptor.cc @@ -8,6 +8,7 @@ #include "base/path_service.h" #include "chrome/browser/chrome_plugin_service_filter.h" #include "chrome/common/chrome_paths.h" +#include "content/browser/plugin_service.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "googleurl/src/gurl.h" @@ -15,7 +16,7 @@ #include "net/base/load_flags.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_redirect_job.h" -#include "webkit/plugins/npapi/plugin_list.h" +#include "webkit/plugins/webplugininfo.h" namespace chromeos { @@ -65,8 +66,7 @@ bool GViewRequestInterceptor::ShouldUsePdfPlugin( return false; webkit::WebPluginInfo plugin; - if (!webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath( - pdf_path, &plugin)) { + if (!PluginService::GetInstance()->GetPluginInfoByPath(pdf_path, &plugin)) { return false; } |