| Index: content/browser/browser_plugin/browser_plugin_embedder.cc
|
| diff --git a/content/browser/browser_plugin/browser_plugin_embedder.cc b/content/browser/browser_plugin/browser_plugin_embedder.cc
|
| index 16a75a190b28bad614ed91b2640131bc35ed60e8..76e2446effbc6c69c564852bd361793f1105d7b8 100644
|
| --- a/content/browser/browser_plugin/browser_plugin_embedder.cc
|
| +++ b/content/browser/browser_plugin/browser_plugin_embedder.cc
|
| @@ -116,10 +116,6 @@ void BrowserPluginEmbedder::DidSendScreenRects() {
|
| base::Bind(&BrowserPluginEmbedder::DidSendScreenRectsCallback));
|
| }
|
|
|
| -bool BrowserPluginEmbedder::OnMessageReceived(const IPC::Message& message) {
|
| - return OnMessageReceived(message, nullptr);
|
| -}
|
| -
|
| bool BrowserPluginEmbedder::OnMessageReceived(
|
| const IPC::Message& message,
|
| RenderFrameHost* render_frame_host) {
|
| @@ -127,8 +123,6 @@ bool BrowserPluginEmbedder::OnMessageReceived(
|
| IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(BrowserPluginEmbedder, message,
|
| render_frame_host)
|
| IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_Attach, OnAttach)
|
| - IPC_MESSAGE_HANDLER_GENERIC(DragHostMsg_UpdateDragCursor,
|
| - OnUpdateDragCursor(&handled));
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| @@ -156,8 +150,8 @@ void BrowserPluginEmbedder::SystemDragEnded() {
|
| ClearGuestDragStateIfApplicable();
|
| }
|
|
|
| -void BrowserPluginEmbedder::OnUpdateDragCursor(bool* handled) {
|
| - *handled = !!guest_dragging_over_;
|
| +bool BrowserPluginEmbedder::OnUpdateDragCursor() {
|
| + return !!guest_dragging_over_;
|
| }
|
|
|
| void BrowserPluginEmbedder::OnAttach(
|
|
|