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

Side by Side Diff: content/common/frame_owner_properties.h

Issue 2156883002: Use content::FrameOwnerProperties instead of blink::WebFrameOwnerProperties in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-delegation-frame-owner-properties
Patch Set: Use this everywhere Created 4 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 CONTENT_COMMON_FRAME_OWNER_PROPERTIES_H_ 5 #ifndef CONTENT_COMMON_FRAME_OWNER_PROPERTIES_H_
6 #define CONTENT_COMMON_FRAME_OWNER_PROPERTIES_H_ 6 #define CONTENT_COMMON_FRAME_OWNER_PROPERTIES_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "content/common/content_export.h"
10 #include "third_party/WebKit/public/platform/modules/permissions/WebPermissionTy pe.h" 11 #include "third_party/WebKit/public/platform/modules/permissions/WebPermissionTy pe.h"
11 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" 12 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
12 13
13 namespace content { 14 namespace content {
14 15
15 // Used for IPC transport of WebFrameOwnerProperties. WebFrameOwnerProperties 16 // Used for IPC transport of WebFrameOwnerProperties. WebFrameOwnerProperties
16 // can't be used directly as it contains a WebVector which doesn't have 17 // can't be used directly as it contains a WebVector which doesn't have
17 // ParamTraits defined. 18 // ParamTraits defined.
18 struct FrameOwnerProperties { 19 struct CONTENT_EXPORT FrameOwnerProperties {
19 FrameOwnerProperties(); 20 FrameOwnerProperties();
20 FrameOwnerProperties(const FrameOwnerProperties& other); 21 FrameOwnerProperties(const FrameOwnerProperties& other);
21 explicit FrameOwnerProperties( 22 explicit FrameOwnerProperties(
22 const blink::WebFrameOwnerProperties& web_frame_owner_properties); 23 const blink::WebFrameOwnerProperties& web_frame_owner_properties);
23 ~FrameOwnerProperties(); 24 ~FrameOwnerProperties();
24 25
25 blink::WebFrameOwnerProperties ToWebFrameOwnerProperties() const; 26 blink::WebFrameOwnerProperties ToWebFrameOwnerProperties() const;
26 27
28 bool operator==(const FrameOwnerProperties& other) const;
29 bool operator!=(const FrameOwnerProperties& other) const {
30 return !(*this == other);
31 }
32
27 blink::WebFrameOwnerProperties::ScrollingMode scrolling_mode; 33 blink::WebFrameOwnerProperties::ScrollingMode scrolling_mode;
28 int margin_width; 34 int margin_width;
29 int margin_height; 35 int margin_height;
30 bool allow_fullscreen; 36 bool allow_fullscreen;
31 std::vector<blink::WebPermissionType> delegated_permissions; 37 std::vector<blink::WebPermissionType> delegated_permissions;
32 }; 38 };
33 39
34 } // namespace content 40 } // namespace content
35 41
36 #endif // CONTENT_COMMON_FRAME_OWNER_PROPERTIES_H_ 42 #endif // CONTENT_COMMON_FRAME_OWNER_PROPERTIES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698