| Index: third_party/WebKit/Source/core/frame/FrameOwner.h
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameOwner.h b/third_party/WebKit/Source/core/frame/FrameOwner.h
|
| index 7031b403f330b63d7710274a7ef7e2a0578415f6..6a2a91401b5b39045c7bc04ffdacf2f0d4258622 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameOwner.h
|
| +++ b/third_party/WebKit/Source/core/frame/FrameOwner.h
|
| @@ -10,7 +10,7 @@
|
| #include "platform/heap/Handle.h"
|
| #include "platform/scroll/ScrollTypes.h"
|
| #include "public/platform/WebVector.h"
|
| -#include "public/platform/modules/permissions/WebPermissionType.h"
|
| +#include "public/platform/modules/permissions/permission.mojom-blink.h"
|
|
|
| namespace blink {
|
|
|
| @@ -49,7 +49,8 @@ class CORE_EXPORT FrameOwner : public GarbageCollectedMixin {
|
| virtual bool allowFullscreen() const = 0;
|
| virtual bool allowPaymentRequest() const = 0;
|
| virtual AtomicString csp() const = 0;
|
| - virtual const WebVector<WebPermissionType>& delegatedPermissions() const = 0;
|
| + virtual const WebVector<mojom::blink::PermissionName>& delegatedPermissions()
|
| + const = 0;
|
| };
|
|
|
| // TODO(dcheng): This class is an internal implementation detail of provisional
|
| @@ -82,8 +83,10 @@ class CORE_EXPORT DummyFrameOwner
|
| bool allowFullscreen() const override { return false; }
|
| bool allowPaymentRequest() const override { return false; }
|
| AtomicString csp() const override { return nullAtom; }
|
| - const WebVector<WebPermissionType>& delegatedPermissions() const override {
|
| - DEFINE_STATIC_LOCAL(WebVector<WebPermissionType>, permissions, ());
|
| + const WebVector<mojom::blink::PermissionName>& delegatedPermissions()
|
| + const override {
|
| + DEFINE_STATIC_LOCAL(WebVector<mojom::blink::PermissionName>, permissions,
|
| + ());
|
| return permissions;
|
| }
|
|
|
|
|