| Index: third_party/WebKit/public/web/WebContentSettingsClient.h
|
| diff --git a/third_party/WebKit/public/web/WebContentSettingsClient.h b/third_party/WebKit/public/web/WebContentSettingsClient.h
|
| index 3d285d2a6c6516875e70904cd2fd41fa3ba96282..eaa4368bd039600da45e1417337d0d0cca9e9def 100644
|
| --- a/third_party/WebKit/public/web/WebContentSettingsClient.h
|
| +++ b/third_party/WebKit/public/web/WebContentSettingsClient.h
|
| @@ -43,7 +43,7 @@ public:
|
| virtual bool allowScriptFromSource(bool enabledPerSettings, const WebURL& scriptURL) { return enabledPerSettings; }
|
|
|
| // Controls whether insecrure content is allowed to display for this frame.
|
| - virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, const WebSecurityOrigin&, const WebURL&) { return enabledPerSettings; }
|
| + virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, const WebURL&) { return enabledPerSettings; }
|
|
|
| // Controls whether insecrure scripts are allowed to execute for this frame.
|
| virtual bool allowRunningInsecureContent(bool enabledPerSettings, const WebSecurityOrigin&, const WebURL&) { return enabledPerSettings; }
|
|
|