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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2503563002: Drag-and-drop: updateDragCursor (Closed)
Patch Set: Created 4 years, 1 month 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/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 367951acc517b810c354a23f9e2958c869927969..6da1dd09d9ab6d2cd99124dde0df5f88c3fedf6b 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -665,13 +665,14 @@ RenderFrameHostManager* WebContentsImpl::GetRenderManagerForTesting() {
bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host,
const IPC::Message& message) {
- return OnMessageReceived(render_view_host, NULL, message);
+ return OnMessageReceived(render_view_host, nullptr, nullptr, message);
}
bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host,
+ RenderWidgetHost* render_widget_host,
RenderFrameHost* render_frame_host,
const IPC::Message& message) {
- DCHECK(render_view_host || render_frame_host);
+ DCHECK(render_view_host || render_widget_host || render_frame_host);
if (GetWebUI() &&
static_cast<WebUIImpl*>(GetWebUI())->OnMessageReceived(message)) {
return true;
@@ -2488,6 +2489,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
return text_input_manager_.get();
}
+bool WebContentsImpl::OnMessageReceived(RenderWidgetHost* render_widget_host,
+ const IPC::Message& message) {
+ return OnMessageReceived(nullptr, render_widget_host, nullptr, message);
+}
+
BrowserAccessibilityManager*
WebContentsImpl::GetRootBrowserAccessibilityManager() {
RenderFrameHostImpl* rfh = GetMainFrame();
@@ -4022,7 +4028,7 @@ void WebContentsImpl::NotifyNavigationEntryCommitted(
bool WebContentsImpl::OnMessageReceived(RenderFrameHost* render_frame_host,
const IPC::Message& message) {
- return OnMessageReceived(NULL, render_frame_host, message);
+ return OnMessageReceived(nullptr, nullptr, render_frame_host, message);
}
void WebContentsImpl::OnAssociatedInterfaceRequest(

Powered by Google App Engine
This is Rietveld 408576698