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 826167f2d33b2de6ea9a2a8b3dceadd7b46392d0..99a8fde739072e0408b41814abea52829302cce4 100644 |
--- a/content/browser/browser_plugin/browser_plugin_embedder.cc |
+++ b/content/browser/browser_plugin/browser_plugin_embedder.cc |
@@ -33,8 +33,9 @@ BrowserPluginEmbedder* BrowserPluginEmbedder::Create( |
return new BrowserPluginEmbedder(web_contents); |
} |
-void BrowserPluginEmbedder::DragEnteredGuest(BrowserPluginGuest* guest) { |
+bool BrowserPluginEmbedder::DragEnteredGuest(BrowserPluginGuest* guest) { |
guest_dragging_over_ = guest->AsWeakPtr(); |
+ return guest_started_drag_.get() == guest; |
} |
void BrowserPluginEmbedder::DragLeftGuest(BrowserPluginGuest* guest) { |
@@ -125,7 +126,7 @@ void BrowserPluginEmbedder::SystemDragEnded() { |
} |
void BrowserPluginEmbedder::OnUpdateDragCursor(bool* handled) { |
- *handled = (guest_dragging_over_.get() != NULL); |
+ *handled = !!guest_dragging_over_; |
} |
void BrowserPluginEmbedder::OnAttach( |