summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornasko <nasko@chromium.org>2016-03-25 15:18:44 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 22:20:07 +0000
commita949e39cbe5f6ef8bad2e9221af8ee1152be2419 (patch)
treebe65e8675b1f266c2eb32a4f119493b6deb0f830
parent277738b70c694a1017dfce3305badf4c319bed30 (diff)
downloadchromium_src-a949e39cbe5f6ef8bad2e9221af8ee1152be2419.zip
chromium_src-a949e39cbe5f6ef8bad2e9221af8ee1152be2419.tar.gz
chromium_src-a949e39cbe5f6ef8bad2e9221af8ee1152be2419.tar.bz2
Remove unused code from RenderFrameProxyHost.
Since swapped out state on RenderFrameHost has been removed, there is no longer usage of RenderFrameProxyHost transfering ownership and the code can safely be removed. BUG=357747 CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation Review URL: https://codereview.chromium.org/1831233004 Cr-Commit-Position: refs/heads/master@{#383383}
-rw-r--r--content/browser/frame_host/render_frame_proxy_host.cc12
-rw-r--r--content/browser/frame_host/render_frame_proxy_host.h4
2 files changed, 0 insertions, 16 deletions
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index 4193ba0..f4ba295 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -122,18 +122,6 @@ RenderWidgetHostView* RenderFrameProxyHost::GetRenderWidgetHostView() {
->GetRenderWidgetHostView();
}
-void RenderFrameProxyHost::TakeFrameHostOwnership(
- scoped_ptr<RenderFrameHostImpl> render_frame_host) {
- CHECK(render_frame_host_ == nullptr);
- render_frame_host_ = std::move(render_frame_host);
- render_frame_host_->set_render_frame_proxy_host(this);
-}
-
-scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() {
- render_frame_host_->set_render_frame_proxy_host(NULL);
- return std::move(render_frame_host_);
-}
-
bool RenderFrameProxyHost::Send(IPC::Message *msg) {
return GetProcess()->Send(msg);
}
diff --git a/content/browser/frame_host/render_frame_proxy_host.h b/content/browser/frame_host/render_frame_proxy_host.h
index 390de28..6aa2848 100644
--- a/content/browser/frame_host/render_frame_proxy_host.h
+++ b/content/browser/frame_host/render_frame_proxy_host.h
@@ -96,10 +96,6 @@ class RenderFrameProxyHost
RenderViewHostImpl* GetRenderViewHost();
RenderWidgetHostView* GetRenderWidgetHostView();
- void TakeFrameHostOwnership(
- scoped_ptr<RenderFrameHostImpl> render_frame_host);
- scoped_ptr<RenderFrameHostImpl> PassFrameHostOwnership();
-
// IPC::Sender
bool Send(IPC::Message* msg) override;