diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-21 04:29:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-21 04:29:20 +0000 |
| commit | d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a (patch) | |
| tree | 58b9de096179d94ab1fa05470340709e76cfdf49 /content/browser/plugin_service_impl.h | |
| parent | ec7293192cc51edb8a89f084a165d384f5f82ab9 (diff) | |
| download | chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.zip chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.tar.gz chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.tar.bz2 | |
Move webplugininfo.h to content/public.
BUG=237249
TBR=scottmg
Review URL: https://codereview.chromium.org/19894003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_service_impl.h')
| -rw-r--r-- | content/browser/plugin_service_impl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h index d88f3eb..d71cacc 100644 --- a/content/browser/plugin_service_impl.h +++ b/content/browser/plugin_service_impl.h @@ -76,7 +76,7 @@ class CONTENT_EXPORT PluginServiceImpl const GURL& url, const std::string& mime_type, bool allow_wildcard, - std::vector<webkit::WebPluginInfo>* info, + std::vector<WebPluginInfo>* info, std::vector<std::string>* actual_mime_types) OVERRIDE; virtual bool GetPluginInfo(int render_process_id, int render_view_id, @@ -86,10 +86,10 @@ class CONTENT_EXPORT PluginServiceImpl const std::string& mime_type, bool allow_wildcard, bool* is_stale, - webkit::WebPluginInfo* info, + WebPluginInfo* info, std::string* actual_mime_type) OVERRIDE; virtual bool GetPluginInfoByPath(const base::FilePath& plugin_path, - webkit::WebPluginInfo* info) OVERRIDE; + WebPluginInfo* info) OVERRIDE; virtual string16 GetPluginDisplayNameByPath( const base::FilePath& path) OVERRIDE; virtual void GetPlugins(const GetPluginsCallback& callback) OVERRIDE; @@ -104,10 +104,10 @@ class CONTENT_EXPORT PluginServiceImpl virtual void RemoveExtraPluginPath(const base::FilePath& path) OVERRIDE; virtual void AddExtraPluginDir(const base::FilePath& path) OVERRIDE; virtual void RegisterInternalPlugin( - const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE; + const WebPluginInfo& info, bool add_at_beginning) OVERRIDE; virtual void UnregisterInternalPlugin(const base::FilePath& path) OVERRIDE; virtual void GetInternalPlugins( - std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE; + std::vector<WebPluginInfo>* plugins) OVERRIDE; virtual bool NPAPIPluginsSupported() OVERRIDE; virtual void DisablePluginsDiscoveryForTesting() OVERRIDE; #if defined(OS_MACOSX) @@ -191,7 +191,7 @@ class CONTENT_EXPORT PluginServiceImpl const GURL& url, const std::string& mime_type, PluginProcessHost::Client* client, - const std::vector<webkit::WebPluginInfo>&); + const std::vector<WebPluginInfo>&); // Helper so we can do the plugin lookup on the FILE thread. void GetAllowedPluginForOpenChannelToPlugin( int render_process_id, |