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

Unified Diff: content/browser/browser_plugin/browser_plugin_embedder.h

Issue 12086095: Fixed drag and drop into and out of Browser Plugin. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Addressed comments Created 7 years, 10 months 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/browser_plugin/browser_plugin_embedder.h
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.h b/content/browser/browser_plugin/browser_plugin_embedder.h
index b8450070f171e9a4aa3d27813860789e82f3680d..7e9559ad963b948b209e86a5669592464fd8ff71 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder.h
+++ b/content/browser/browser_plugin/browser_plugin_embedder.h
@@ -22,6 +22,7 @@
#include <map>
+#include "base/memory/weak_ptr.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_contents.h"
@@ -96,11 +97,20 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver,
virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ void OnDragStopped(const IPC::Message& message, bool* handled);
+ void OnUpdateDragCursor(bool* handled);
+
// NotificationObserver method override.
virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) OVERRIDE;
+ void DragEnteredGuest(BrowserPluginGuest* guest);
+
+ void DragLeftGuest(BrowserPluginGuest* guest);
+
+ void StartDrag(BrowserPluginGuest* guest);
+
private:
friend class TestBrowserPluginEmbedder;
@@ -151,6 +161,8 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver,
// Next request id for BrowserPluginMsg_PluginAtPositionRequest query.
int next_get_render_view_request_id_;
int next_instance_id_;
+ base::WeakPtr<BrowserPluginGuest> guest_dragging_over_;
+ base::WeakPtr<BrowserPluginGuest> guest_started_drag_;
DISALLOW_COPY_AND_ASSIGN(BrowserPluginEmbedder);
};

Powered by Google App Engine
This is Rietveld 408576698