| Index: content/shell/renderer/test_runner/WebPermissions.h
|
| diff --git a/content/shell/renderer/test_runner/WebPermissions.h b/content/shell/renderer/test_runner/WebPermissions.h
|
| index 724dc58982f241b0108fba834de768eb975aa580..2ccc8eb552cb5b6226d3b08d80302e165477f6f1 100644
|
| --- a/content/shell/renderer/test_runner/WebPermissions.h
|
| +++ b/content/shell/renderer/test_runner/WebPermissions.h
|
| @@ -19,12 +19,22 @@ public:
|
|
|
| // Override WebPermissionClient methods.
|
| // TODO(jam): remove all these methods after Blink rolls.
|
| - virtual bool allowImage(blink::WebFrame*, bool enabledPerSettings, const blink::WebURL& imageURL);
|
| - virtual bool allowScriptFromSource(blink::WebFrame*, bool enabledPerSettings, const blink::WebURL& scriptURL);
|
| - virtual bool allowStorage(blink::WebFrame*, bool local);
|
| - virtual bool allowPlugins(blink::WebFrame*, bool enabledPerSettings);
|
| - virtual bool allowDisplayingInsecureContent(blink::WebFrame*, bool enabledPerSettings, const blink::WebSecurityOrigin&, const blink::WebURL&);
|
| - virtual bool allowRunningInsecureContent(blink::WebFrame*, bool enabledPerSettings, const blink::WebSecurityOrigin&, const blink::WebURL&);
|
| + virtual bool allowImage(blink::WebLocalFrame*,
|
| + bool enabledPerSettings,
|
| + const blink::WebURL& imageURL);
|
| + virtual bool allowScriptFromSource(blink::WebLocalFrame*,
|
| + bool enabledPerSettings,
|
| + const blink::WebURL& scriptURL);
|
| + virtual bool allowStorage(blink::WebLocalFrame*, bool local);
|
| + virtual bool allowPlugins(blink::WebLocalFrame*, bool enabledPerSettings);
|
| + virtual bool allowDisplayingInsecureContent(blink::WebLocalFrame*,
|
| + bool enabledPerSettings,
|
| + const blink::WebSecurityOrigin&,
|
| + const blink::WebURL&);
|
| + virtual bool allowRunningInsecureContent(blink::WebLocalFrame*,
|
| + bool enabledPerSettings,
|
| + const blink::WebSecurityOrigin&,
|
| + const blink::WebURL&);
|
|
|
| virtual bool allowImage(bool enabledPerSettings, const blink::WebURL& imageURL);
|
| virtual bool allowScriptFromSource(bool enabledPerSettings, const blink::WebURL& scriptURL);
|
|
|