Chromium Code Reviews| 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 "public/platform/WebString.h" | 8 #include "public/platform/WebString.h" |
| 9 #include "public/platform/WebVector.h" | 9 #include "public/platform/WebVector.h" |
| 10 #include "public/platform/modules/permissions/WebPermissionType.h" | 10 #include "public/platform/modules/permissions/WebPermissionType.h" |
| 11 | |
|
jbroman
2016/11/05 22:51:09
This change looks unrelated to this CL; revert?
| |
| 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 ScrollingMode scrollingMode; | 19 ScrollingMode scrollingMode; |
| 19 int marginWidth; | 20 int marginWidth; |
| 20 int marginHeight; | 21 int marginHeight; |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 41 marginHeight(marginHeight), | 42 marginHeight(marginHeight), |
| 42 allowFullscreen(allowFullscreen), | 43 allowFullscreen(allowFullscreen), |
| 43 requiredCsp(requiredCsp), | 44 requiredCsp(requiredCsp), |
| 44 delegatedPermissions(delegatedPermissions) {} | 45 delegatedPermissions(delegatedPermissions) {} |
| 45 #endif | 46 #endif |
| 46 }; | 47 }; |
| 47 | 48 |
| 48 } // namespace blink | 49 } // namespace blink |
| 49 | 50 |
| 50 #endif | 51 #endif |
| OLD | NEW |