Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Unified Diff: third_party/WebKit/Source/core/frame/FrameOwner.h

Issue 2682953002: Make delegated permissions use mojo generated -permissions. (Closed)
Patch Set: fix nit Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;
}
« no previous file with comments | « content/common/frame_owner_properties.cc ('k') | third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698