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

Unified Diff: content/browser/plugin_service.h

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 | « chrome/common/chrome_content_client.cc ('k') | content/browser/plugin_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/plugin_service.h
===================================================================
--- content/browser/plugin_service.h (revision 101488)
+++ content/browser/plugin_service.h (working copy)
@@ -25,6 +25,7 @@
#include "content/common/notification_registrar.h"
#include "googleurl/src/gurl.h"
#include "ipc/ipc_channel_handle.h"
+#include "webkit/plugins/ppapi/ppapi_plugin_list.h"
#include "webkit/plugins/webplugininfo.h"
#if defined(OS_WIN)
@@ -36,7 +37,6 @@
#include "base/files/file_path_watcher.h"
#endif
-struct PepperPluginInfo;
class PluginDirWatcherDelegate;
namespace content {
@@ -146,7 +146,8 @@
void RegisterPepperPlugins();
- PepperPluginInfo* GetRegisteredPpapiPluginInfo(const FilePath& plugin_path);
+ const webkit::ppapi::PluginInfo* GetRegisteredPpapiPluginInfo(
+ const FilePath& plugin_path);
// Helper so we can do the plugin lookup on the FILE thread.
void GetAllowedPluginForOpenChannelToPlugin(
@@ -192,7 +193,7 @@
scoped_refptr<PluginDirWatcherDelegate> file_watcher_delegate_;
#endif
- std::vector<PepperPluginInfo> ppapi_plugins_;
+ webkit::ppapi::PluginList ppapi_plugins_;
// Weak pointer; outlives us.
content::PluginServiceFilter* filter_;
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | content/browser/plugin_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698