Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: chrome/browser/component_updater/pepper_flash_component_installer.cc

Issue 7978009: Split ppapi::PluginList from PepperPluginRegistry so that DRT could load pepper plugins. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698