| Index: content/browser/web_contents/web_contents_impl.h
|
| diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
|
| index 60fdc726a86e9005a816a5b400dbf8a380c3f9e7..dd750e00c01ae2c076d39c6a0981d849e3602071 100644
|
| --- a/content/browser/web_contents/web_contents_impl.h
|
| +++ b/content/browser/web_contents/web_contents_impl.h
|
| @@ -773,6 +773,7 @@ class CONTENT_EXPORT WebContentsImpl
|
| bool is_hung);
|
| void OnPluginCrashed(const base::FilePath& plugin_path,
|
| base::ProcessId plugin_pid);
|
| + void OnPluginContentOriginAllowed(const GURL& content_origin);
|
| void OnDomOperationResponse(const std::string& json_string,
|
| int automation_id);
|
| void OnAppCacheAccessed(const GURL& manifest_url, bool blocked_by_policy);
|
| @@ -930,6 +931,9 @@ class CONTENT_EXPORT WebContentsImpl
|
| void RemoveAllMediaPlayerEntries(RenderFrameHost* render_frame_host,
|
| ActiveMediaPlayerMap* player_map);
|
|
|
| + // Gets the tab-wide plugin content origin whitelist.
|
| + std::set<GURL> GetPluginContentOriginWhitelist();
|
| +
|
| // Adds/removes a callback called on creation of each new WebContents.
|
| // Deprecated, about to remove.
|
| static void AddCreatedCallback(const CreatedCallback& callback);
|
| @@ -990,6 +994,12 @@ class CONTENT_EXPORT WebContentsImpl
|
| scoped_ptr<PowerSaveBlocker> audio_power_save_blocker_;
|
| scoped_ptr<PowerSaveBlocker> video_power_save_blocker_;
|
|
|
| +#if defined(ENABLE_PLUGINS)
|
| + // Plugin content origins that have been whitelisted.
|
| + typedef std::map<RenderFrameHost*, std::set<GURL>> PluginContentOriginMap;
|
| + PluginContentOriginMap plugin_content_origin_whitelist_;
|
| +#endif
|
| +
|
| // Manages the frame tree of the page and process swaps in each node.
|
| FrameTree frame_tree_;
|
|
|
|
|