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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 8d29386d448718d125b6b215d3cd58f965ffa081..4aceaf571b422a133f722bdcda44dd6ceb9b7b1b 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -83,7 +83,6 @@
#include "content/public/common/url_utils.h"
#include "device/vibration/vibration_manager_impl.h"
#include "services/shell/public/cpp/interface_provider.h"
-#include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
#include "ui/accessibility/ax_tree.h"
#include "ui/accessibility/ax_tree_update.h"
#include "ui/gfx/geometry/quad_f.h"
@@ -906,7 +905,7 @@ void RenderFrameHostImpl::OnCreateChildFrame(
const std::string& frame_name,
const std::string& frame_unique_name,
blink::WebSandboxFlags sandbox_flags,
- const blink::WebFrameOwnerProperties& frame_owner_properties) {
+ const FrameOwnerProperties& frame_owner_properties) {
// TODO(lukasza): Call ReceivedBadMessage when |frame_unique_name| is empty.
DCHECK(!frame_unique_name.empty());
@@ -1667,12 +1666,9 @@ void RenderFrameHostImpl::OnDidChangeFrameOwnerProperties(
if (!child)
return;
- blink::WebFrameOwnerProperties web_properties =
- properties.ToWebFrameOwnerProperties();
+ child->set_frame_owner_properties(properties);
- child->set_frame_owner_properties(web_properties);
-
- child->render_manager()->OnDidUpdateFrameOwnerProperties(web_properties);
+ child->render_manager()->OnDidUpdateFrameOwnerProperties(properties);
}
void RenderFrameHostImpl::OnUpdateTitle(
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/frame_host/render_frame_host_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698