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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #if defined(USE_EXTERNAL_POPUP_MENU) 58 #if defined(USE_EXTERNAL_POPUP_MENU)
59 struct FrameHostMsg_ShowPopup_Params; 59 struct FrameHostMsg_ShowPopup_Params;
60 #endif 60 #endif
61 61
62 namespace base { 62 namespace base {
63 class FilePath; 63 class FilePath;
64 class ListValue; 64 class ListValue;
65 } 65 }
66 66
67 namespace blink { 67 namespace blink {
68 struct WebFrameOwnerProperties;
69 }
70
71 namespace blink {
72 namespace mojom { 68 namespace mojom {
73 class WebBluetoothService; 69 class WebBluetoothService;
74 } 70 }
75 } 71 }
76 72
77 namespace content { 73 namespace content {
78 74
79 class CrossProcessFrameConnector; 75 class CrossProcessFrameConnector;
80 class CrossSiteTransferringRequest; 76 class CrossSiteTransferringRequest;
81 class FrameMojoShell; 77 class FrameMojoShell;
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 // Tracks whether the RenderFrame for this RenderFrameHost has been created in 213 // Tracks whether the RenderFrame for this RenderFrameHost has been created in
218 // the renderer process. This is currently only used for subframes. 214 // the renderer process. This is currently only used for subframes.
219 // TODO(creis): Use this for main frames as well when RVH goes away. 215 // TODO(creis): Use this for main frames as well when RVH goes away.
220 void SetRenderFrameCreated(bool created); 216 void SetRenderFrameCreated(bool created);
221 217
222 // Called for renderer-created windows to resume requests from this frame, 218 // Called for renderer-created windows to resume requests from this frame,
223 // after they are blocked in RenderWidgetHelper::CreateNewWindow. 219 // after they are blocked in RenderWidgetHelper::CreateNewWindow.
224 void Init(); 220 void Init();
225 221
226 int routing_id() const { return routing_id_; } 222 int routing_id() const { return routing_id_; }
227 void OnCreateChildFrame( 223 void OnCreateChildFrame(int new_routing_id,
228 int new_routing_id, 224 blink::WebTreeScopeType scope,
229 blink::WebTreeScopeType scope, 225 const std::string& frame_name,
230 const std::string& frame_name, 226 const std::string& frame_unique_name,
231 const std::string& frame_unique_name, 227 blink::WebSandboxFlags sandbox_flags,
232 blink::WebSandboxFlags sandbox_flags, 228 const FrameOwnerProperties& frame_owner_properties);
233 const blink::WebFrameOwnerProperties& frame_owner_properties);
234 229
235 RenderViewHostImpl* render_view_host() { return render_view_host_; } 230 RenderViewHostImpl* render_view_host() { return render_view_host_; }
236 RenderFrameHostDelegate* delegate() { return delegate_; } 231 RenderFrameHostDelegate* delegate() { return delegate_; }
237 FrameTreeNode* frame_tree_node() { return frame_tree_node_; } 232 FrameTreeNode* frame_tree_node() { return frame_tree_node_; }
238 233
239 const GURL& last_committed_url() const { return last_committed_url_; } 234 const GURL& last_committed_url() const { return last_committed_url_; }
240 235
241 // Allows FrameTreeNode::SetCurrentURL to update this frame's last committed 236 // Allows FrameTreeNode::SetCurrentURL to update this frame's last committed
242 // URL. Do not call this directly, since we rely on SetCurrentURL to track 237 // URL. Do not call this directly, since we rely on SetCurrentURL to track
243 // whether a real load has committed or not. 238 // whether a real load has committed or not.
(...skipping 800 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 1039
1045 // NOTE: This must be the last member. 1040 // NOTE: This must be the last member.
1046 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 1041 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
1047 1042
1048 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 1043 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
1049 }; 1044 };
1050 1045
1051 } // namespace content 1046 } // namespace content
1052 1047
1053 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 1048 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698