Index: chrome/browser/component_updater/pepper_flash_component_installer.cc |
=================================================================== |
--- chrome/browser/component_updater/pepper_flash_component_installer.cc (revision 101488) |
+++ chrome/browser/component_updater/pepper_flash_component_installer.cc (working copy) |
@@ -19,11 +19,11 @@ |
#include "chrome/browser/plugin_prefs.h" |
#include "chrome/common/chrome_paths.h" |
#include "content/browser/browser_thread.h" |
-#include "content/common/pepper_plugin_registry.h" |
#include "ppapi/c/private/ppb_pdf.h" |
#include "webkit/plugins/npapi/plugin_list.h" |
#include "webkit/plugins/plugin_constants.h" |
#include "webkit/plugins/ppapi/plugin_module.h" |
+#include "webkit/plugins/ppapi/ppapi_plugin_info.h" |
namespace { |
@@ -108,7 +108,7 @@ |
bool MakePepperFlashPluginInfo(const FilePath& flash_path, |
const Version& flash_version, |
bool out_of_process, |
- PepperPluginInfo* plugin_info) { |
+ webkit::ppapi::PluginInfo* plugin_info) { |
if (!flash_version.IsValid()) |
return false; |
const std::vector<uint16> ver_nums = flash_version.components(); |
@@ -140,13 +140,15 @@ |
void RegisterPepperFlashWithChrome(const FilePath& path, |
const Version& version) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
- PepperPluginInfo plugin_info; |
+ webkit::ppapi::PluginInfo plugin_info; |
// Register it as out-of-process and disabled. |
if (!MakePepperFlashPluginInfo(path, version, true, &plugin_info)) |
return; |
PluginPrefs::EnablePluginGlobally(false, plugin_info.path); |
+ webkit::WebPluginInfo webplugin_info; |
+ webkit::ppapi::PepperToWebPluginInfo(plugin_info, &webplugin_info); |
webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin( |
- plugin_info.ToWebPluginInfo()); |
+ webplugin_info); |
webkit::npapi::PluginList::Singleton()->RefreshPlugins(); |
} |