Separate RenderViewHost from RenderWidgetHost, part 7: move more calls to the RenderWidgetHostDelegate.
The WebContentsImpl is already a RenderWidgetHostDelegate, so there's no reason to detour through the RenderViewHostImpl.
Also remove "virtual" from a not-overridden function, and remove an abandoned declaration.
BUG=542477
TEST=all green
Review URL: https://codereview.chromium.org/1435573003
Cr-Commit-Position: refs/heads/master@{#359017}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 292e2b37..c07fa27 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1480,7 +1480,10 @@
delegate_->ActivateContents(this);
}
-void WebContentsImpl::LostCapture() {
+void WebContentsImpl::LostCapture(RenderWidgetHostImpl* render_widget_host) {
+ if (!RenderViewHostImpl::From(render_widget_host))
+ return;
+
if (delegate_)
delegate_->LostCapture();
}
@@ -1685,7 +1688,10 @@
GotResponseToLockMouseRequest(false);
}
-void WebContentsImpl::LostMouseLock() {
+void WebContentsImpl::LostMouseLock(RenderWidgetHostImpl* render_widget_host) {
+ if (!RenderViewHostImpl::From(render_widget_host))
+ return;
+
if (delegate_)
delegate_->LostMouseLock();
}
