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

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, 8 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 ddcf6f1fbea001b9fc37cebece4ef7fc76f6be1f..993d06eb388930060c0ae667e5ac9809876e80ed 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder.h
+++ b/content/browser/browser_plugin/browser_plugin_embedder.h
@@ -16,8 +16,10 @@
#include <map>
+#include "base/memory/weak_ptr.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h"
struct BrowserPluginHostMsg_CreateGuest_Params;
struct BrowserPluginHostMsg_ResizeGuest_Params;
@@ -28,6 +30,7 @@ class Point;
namespace content {
+class BrowserPluginGuest;
class BrowserPluginGuestManager;
class BrowserPluginHostFactory;
class WebContentsImpl;
@@ -55,6 +58,23 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
// WebContentsObserver implementation.
virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ virtual void SystemDragEnded() OVERRIDE;
+
+ void DragSourceEndedAt(int client_x, int client_y, int screen_x,
+ int screen_y, WebKit::WebDragOperation operation);
+
+ void DragSourceMovedTo(int client_x, int client_y,
+ int screen_x, int screen_y);
+
+ void OnUpdateDragCursor(bool* handled);
+
+ void DragEnteredGuest(BrowserPluginGuest* guest);
+
+ void DragLeftGuest(BrowserPluginGuest* guest);
+
+ void StartDrag(BrowserPluginGuest* guest);
+
+ void StopDrag(BrowserPluginGuest* guest);
private:
friend class TestBrowserPluginEmbedder;
@@ -87,6 +107,8 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
GetRenderViewHostCallbackMap pending_get_render_view_callbacks_;
// Next request id for BrowserPluginMsg_PluginAtPositionRequest query.
int next_get_render_view_request_id_;
+ base::WeakPtr<BrowserPluginGuest> guest_dragging_over_;
Fady Samuel 2013/04/18 21:22:41 Could you please add comments over these two point
mthiesse 2013/04/19 14:55:49 Done.
+ base::WeakPtr<BrowserPluginGuest> guest_started_drag_;
DISALLOW_COPY_AND_ASSIGN(BrowserPluginEmbedder);
};

Powered by Google App Engine
This is Rietveld 408576698