diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 22:23:36 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 22:23:36 +0000 |
| commit | 9a60ccb9a18e801252c78aee635bb169bfb699e0 (patch) | |
| tree | 7f63a140a43c63bbebc358633c54508424461778 /content/browser/plugin_service_impl.h | |
| parent | 4ca60e35a3fc80e885a7296aaf742343e5ca8f30 (diff) | |
| download | chromium_src-9a60ccb9a18e801252c78aee635bb169bfb699e0.zip chromium_src-9a60ccb9a18e801252c78aee635bb169bfb699e0.tar.gz chromium_src-9a60ccb9a18e801252c78aee635bb169bfb699e0.tar.bz2 | |
Remove webkit/plugins/npapi.
-NPAPIPluginsSupported moves to PluginService
-no need to call it in PluginList methods anymore since PluginService is now the only place that calls these methods, and it can check first
-no need for the renderer to call this first since now the browser won't enumerate NPAPI plugins if it's disabled
-CreateVersionFromString moves to WebPluginInfo. I couldn't find a better place to put it.
-move the constants back to plugin_constants_win.h
-move PLUGIN_QUIRK_DIE_AFTER_UNLOAD handling to WebPluginDelegateStub and PluginThread instead of being a global
-GetDefaultWindowParent moves to plugin_constants_win.h. I couldn't find a better place.
-IsPluginWindow moves to PluginService
-GetPluginNameFromWindow and GetPluginVersionFromWindow are both replaced by GetPluginInfoFromWindow which is on PluginService
-IsDummyActivationWindow was called by one place so I moved the code there
BUG=237249
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/19844003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_service_impl.h')
| -rw-r--r-- | content/browser/plugin_service_impl.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h index b3d928d..d88f3eb 100644 --- a/content/browser/plugin_service_impl.h +++ b/content/browser/plugin_service_impl.h @@ -108,9 +108,17 @@ class CONTENT_EXPORT PluginServiceImpl virtual void UnregisterInternalPlugin(const base::FilePath& path) OVERRIDE; virtual void GetInternalPlugins( std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE; + virtual bool NPAPIPluginsSupported() OVERRIDE; virtual void DisablePluginsDiscoveryForTesting() OVERRIDE; #if defined(OS_MACOSX) virtual void AppActivated() OVERRIDE; +#elif defined(OS_WIN) + virtual bool GetPluginInfoFromWindow(HWND window, + base::string16* plugin_name, + base::string16* plugin_version) OVERRIDE; + + // Returns true iff the given HWND is a plugin. + bool IsPluginWindow(HWND window); #endif // Returns the plugin process host corresponding to the plugin process that |