diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/content/browser/plugin_service_impl.h | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/browser/plugin_service_impl.h')
| -rw-r--r-- | chromium/content/browser/plugin_service_impl.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chromium/content/browser/plugin_service_impl.h b/chromium/content/browser/plugin_service_impl.h index 11fb257e99b..e95fa7c9786 100644 --- a/chromium/content/browser/plugin_service_impl.h +++ b/chromium/content/browser/plugin_service_impl.h @@ -59,7 +59,7 @@ struct PepperPluginInfo; // surpass that limit. struct PluginServiceFilterParams { int render_process_id; - int render_view_id; + int render_frame_id; GURL page_url; ResourceContext* resource_context; }; @@ -80,7 +80,7 @@ class CONTENT_EXPORT PluginServiceImpl std::vector<WebPluginInfo>* info, std::vector<std::string>* actual_mime_types) OVERRIDE; virtual bool GetPluginInfo(int render_process_id, - int render_view_id, + int render_frame_id, ResourceContext* context, const GURL& url, const GURL& page_url, @@ -91,7 +91,7 @@ class CONTENT_EXPORT PluginServiceImpl std::string* actual_mime_type) OVERRIDE; virtual bool GetPluginInfoByPath(const base::FilePath& plugin_path, WebPluginInfo* info) OVERRIDE; - virtual string16 GetPluginDisplayNameByPath( + virtual base::string16 GetPluginDisplayNameByPath( const base::FilePath& path) OVERRIDE; virtual void GetPlugins(const GetPluginsCallback& callback) OVERRIDE; virtual PepperPluginInfo* GetRegisteredPpapiPluginInfo( @@ -121,6 +121,7 @@ class CONTENT_EXPORT PluginServiceImpl // Returns true iff the given HWND is a plugin. bool IsPluginWindow(HWND window); #endif + virtual bool PpapiDevChannelSupported() OVERRIDE; // Returns the plugin process host corresponding to the plugin process that // has been started by this service. This will start a process to host the @@ -139,7 +140,7 @@ class CONTENT_EXPORT PluginServiceImpl // a new plugin process if necessary. This must be called on the IO thread // or else a deadlock can occur. void OpenChannelToNpapiPlugin(int render_process_id, - int render_view_id, + int render_frame_id, const GURL& url, const GURL& page_url, const std::string& mime_type, @@ -195,7 +196,7 @@ class CONTENT_EXPORT PluginServiceImpl // Helper so we can do the plugin lookup on the FILE thread. void GetAllowedPluginForOpenChannelToPlugin( int render_process_id, - int render_view_id, + int render_frame_id, const GURL& url, const GURL& page_url, const std::string& mime_type, |