| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef WebFrameOwnerProperties_h | 5 #ifndef WebFrameOwnerProperties_h |
| 6 #define WebFrameOwnerProperties_h | 6 #define WebFrameOwnerProperties_h |
| 7 | 7 |
| 8 #include "../platform/WebString.h" | 8 #include "../platform/WebString.h" |
| 9 #include "../platform/WebVector.h" | 9 #include "../platform/WebVector.h" |
| 10 #include "../platform/modules/permissions/WebPermissionType.h" | 10 #include "third_party/WebKit/public/platform/modules/permissions/permission.mojo
m-shared.h" |
| 11 |
| 11 #include <algorithm> | 12 #include <algorithm> |
| 12 | 13 |
| 13 namespace blink { | 14 namespace blink { |
| 14 | 15 |
| 15 struct WebFrameOwnerProperties { | 16 struct WebFrameOwnerProperties { |
| 16 enum class ScrollingMode { Auto, AlwaysOff, AlwaysOn, Last = AlwaysOn }; | 17 enum class ScrollingMode { Auto, AlwaysOff, AlwaysOn, Last = AlwaysOn }; |
| 17 | 18 |
| 18 WebString name; // browsing context container's name | 19 WebString name; // browsing context container's name |
| 19 ScrollingMode scrollingMode; | 20 ScrollingMode scrollingMode; |
| 20 int marginWidth; | 21 int marginWidth; |
| 21 int marginHeight; | 22 int marginHeight; |
| 22 bool allowFullscreen; | 23 bool allowFullscreen; |
| 23 bool allowPaymentRequest; | 24 bool allowPaymentRequest; |
| 24 WebString requiredCsp; | 25 WebString requiredCsp; |
| 25 WebVector<WebPermissionType> delegatedPermissions; | 26 WebVector<mojom::PermissionName> delegatedPermissions; |
| 26 | 27 |
| 27 WebFrameOwnerProperties() | 28 WebFrameOwnerProperties() |
| 28 : scrollingMode(ScrollingMode::Auto), | 29 : scrollingMode(ScrollingMode::Auto), |
| 29 marginWidth(-1), | 30 marginWidth(-1), |
| 30 marginHeight(-1), | 31 marginHeight(-1), |
| 31 allowFullscreen(false), | 32 allowFullscreen(false), |
| 32 allowPaymentRequest(false) {} | 33 allowPaymentRequest(false) {} |
| 33 | 34 |
| 34 #if INSIDE_BLINK | 35 #if INSIDE_BLINK |
| 35 WebFrameOwnerProperties( | 36 WebFrameOwnerProperties( |
| 36 const WebString& name, | 37 const WebString& name, |
| 37 ScrollbarMode scrollingMode, | 38 ScrollbarMode scrollingMode, |
| 38 int marginWidth, | 39 int marginWidth, |
| 39 int marginHeight, | 40 int marginHeight, |
| 40 bool allowFullscreen, | 41 bool allowFullscreen, |
| 41 bool allowPaymentRequest, | 42 bool allowPaymentRequest, |
| 42 const WebString& requiredCsp, | 43 const WebString& requiredCsp, |
| 43 const WebVector<WebPermissionType>& delegatedPermissions) | 44 const WebVector<mojom::PermissionName>& delegatedPermissions) |
| 44 : name(name), | 45 : name(name), |
| 45 scrollingMode(static_cast<ScrollingMode>(scrollingMode)), | 46 scrollingMode(static_cast<ScrollingMode>(scrollingMode)), |
| 46 marginWidth(marginWidth), | 47 marginWidth(marginWidth), |
| 47 marginHeight(marginHeight), | 48 marginHeight(marginHeight), |
| 48 allowFullscreen(allowFullscreen), | 49 allowFullscreen(allowFullscreen), |
| 49 allowPaymentRequest(allowPaymentRequest), | 50 allowPaymentRequest(allowPaymentRequest), |
| 50 requiredCsp(requiredCsp), | 51 requiredCsp(requiredCsp), |
| 51 delegatedPermissions(delegatedPermissions) {} | 52 delegatedPermissions(delegatedPermissions) {} |
| 52 #endif | 53 #endif |
| 53 }; | 54 }; |
| 54 | 55 |
| 55 } // namespace blink | 56 } // namespace blink |
| 56 | 57 |
| 57 #endif | 58 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2682953002:
Make delegated permissions use mojo generated -permissions. (Closed)
