| 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..42c58757d5df49dee5419b188339d70f23a78f8e 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);
|
| @@ -990,6 +991,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::set<GURL> PluginContentOriginSet;
|
| + PluginContentOriginSet plugin_content_origin_whitelist_;
|
| +#endif
|
| +
|
| // Manages the frame tree of the page and process swaps in each node.
|
| FrameTree frame_tree_;
|
|
|
|
|