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

Unified Diff: content/browser/browser_plugin/browser_plugin_guest.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: Re-disabled when command line flag not present. Created 7 years, 11 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_guest.h
diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h
index 5ab1457fd3661441a0bb6ea38e92e7665ff858ae..12268414a4703d619ce4c6eb7dac7b3ca0d2a848 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/content/browser/browser_plugin/browser_plugin_guest.h
@@ -57,6 +57,7 @@ namespace content {
class BrowserPluginHostFactory;
class BrowserPluginEmbedder;
+class DragEventSourceInfo;
class RenderProcessHost;
// A browser plugin guest provides functionality for WebContents to operate in
@@ -169,6 +170,10 @@ class CONTENT_EXPORT BrowserPluginGuest : public NotificationObserver,
// within an embedder.
int instance_id() const { return instance_id_; }
+ bool dragging() { return dragging_; }
+
+ bool drag_over() { return drag_over_; }
+
private:
friend class TestBrowserPluginGuest;
@@ -259,6 +264,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public NotificationObserver,
int* route_id,
int* surface_id,
int64* cloned_session_storage_namespace_id);
+ void OnDragStopped();
void OnHandleInputEventAck(
WebKit::WebInputEvent::Type event_type,
InputEventAckState ack_result);
@@ -272,7 +278,6 @@ class CONTENT_EXPORT BrowserPluginGuest : public NotificationObserver,
void OnShowWidget(int route_id, const gfx::Rect& initial_pos);
// Overriden in tests.
virtual void OnTakeFocus(bool reverse);
- void OnUpdateDragCursor(WebKit::WebDragOperation operation);
void OnUpdateFrameName(int frame_id,
bool is_top_level,
const std::string& name);
@@ -297,6 +302,9 @@ class CONTENT_EXPORT BrowserPluginGuest : public NotificationObserver,
base::TimeDelta guest_hang_timeout_;
bool focused_;
bool visible_;
+ // True if this guest initiated a drag n drop event that is currently active.
+ bool dragging_;
+ bool drag_over_;
std::string name_;
bool auto_size_enabled_;
gfx::Size max_auto_size_;

Powered by Google App Engine
This is Rietveld 408576698