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/ui/browser.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/ui/browser.cc')
| -rw-r--r-- | chrome/browser/ui/browser.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 1cafc10..ea188b2 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -135,6 +135,7 @@ #include "content/browser/download/download_manager.h" #include "content/browser/download/save_package.h" #include "content/browser/host_zoom_map.h" +#include "content/browser/plugin_service.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/interstitial_page.h" @@ -188,8 +189,6 @@ #include "chrome/browser/extensions/file_manager_util.h" #endif -#include "webkit/plugins/npapi/plugin_list.h" - using base::TimeDelta; /////////////////////////////////////////////////////////////////////////////// @@ -2509,7 +2508,7 @@ void Browser::CrashedPluginHelper(TabContents* tab, string16 plugin_name = plugin_path.LossyDisplayName(); webkit::WebPluginInfo plugin_info; - if (webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath( + if (PluginService::GetInstance()->GetPluginInfoByPath( plugin_path, &plugin_info) && !plugin_info.name.empty()) { plugin_name = plugin_info.name; |