| Index: Source/testing/runner/WebPermissions.h
|
| diff --git a/Source/testing/runner/WebPermissions.h b/Source/testing/runner/WebPermissions.h
|
| index 1bdcc8edb50050f4bd6eb11f7b13ee8e9c973f20..18ce38490e7d9fd0e682e8a96c9fc68b46195699 100644
|
| --- a/Source/testing/runner/WebPermissions.h
|
| +++ b/Source/testing/runner/WebPermissions.h
|
| @@ -38,18 +38,18 @@ namespace WebTestRunner {
|
|
|
| class WebTestDelegate;
|
|
|
| -class WebPermissions : public WebKit::WebPermissionClient, public WebKit::WebNonCopyable {
|
| +class WebPermissions : public blink::WebPermissionClient, public blink::WebNonCopyable {
|
| public:
|
| WebPermissions();
|
| virtual ~WebPermissions();
|
|
|
| // Override WebPermissionClient methods.
|
| - virtual bool allowImage(WebKit::WebFrame*, bool enabledPerSettings, const WebKit::WebURL& imageURL);
|
| - virtual bool allowScriptFromSource(WebKit::WebFrame*, bool enabledPerSettings, const WebKit::WebURL& scriptURL);
|
| - virtual bool allowStorage(WebKit::WebFrame*, bool local);
|
| - virtual bool allowPlugins(WebKit::WebFrame*, bool enabledPerSettings);
|
| - virtual bool allowDisplayingInsecureContent(WebKit::WebFrame*, bool enabledPerSettings, const WebKit::WebSecurityOrigin&, const WebKit::WebURL&);
|
| - virtual bool allowRunningInsecureContent(WebKit::WebFrame*, bool enabledPerSettings, const WebKit::WebSecurityOrigin&, const WebKit::WebURL&);
|
| + 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&);
|
|
|
| // Hooks to set the different policies.
|
| void setImagesAllowed(bool);
|
|
|