| Index: content/public/browser/content_browser_client.h
|
| diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
| index 644dc79b2ffa87a2a6834e527349150bf0113475..c9fe505e1fb7abadd5d0d03e42595341beafffb2 100644
|
| --- a/content/public/browser/content_browser_client.h
|
| +++ b/content/public/browser/content_browser_client.h
|
| @@ -743,6 +743,19 @@ class CONTENT_EXPORT ContentBrowserClient {
|
| // protected content.
|
| virtual std::unique_ptr<media::CdmFactory> CreateCdmFactory();
|
|
|
| + // Checks if displaying of mixed-content is allowed for the specified
|
| + // WebContents/tab.
|
| + virtual bool ShouldAllowDisplayingInsecureContent(bool allowed_per_settings,
|
| + const GURL& resource_url,
|
| + WebContents* web_contents);
|
| +
|
| + // Checks if running of mixed-content is allowed for the specified
|
| + // WebContents/tab.
|
| + virtual bool ShouldAllowRunningInsecureContent(bool allowed_per_settings,
|
| + const url::Origin& origin,
|
| + const GURL& resource_url,
|
| + WebContents* web_contents);
|
| +
|
| // Populates |mappings| with all files that need to be mapped before launching
|
| // a child process.
|
| #if defined(OS_ANDROID)
|
|
|