| 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_;
|
|
|