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

Unified Diff: content/browser/web_contents/web_drag_dest_mac.h

Issue 10386014: Implement WebContentsView::GetDropData for Mac; disable on Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert more aura changes. Created 8 years, 7 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/web_contents/web_drag_dest_mac.h
diff --git a/content/browser/web_contents/web_drag_dest_mac.h b/content/browser/web_contents/web_drag_dest_mac.h
index 0e22fa0b4c4f5e3497378781c612d9e81a9bbbc5..0340cfd492fdb5f5650794d0820bd80b42913765 100644
--- a/content/browser/web_contents/web_drag_dest_mac.h
+++ b/content/browser/web_contents/web_drag_dest_mac.h
@@ -4,10 +4,11 @@
#import <Cocoa/Cocoa.h>
+#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
+#include "webkit/glue/webdropdata.h"
class WebContentsImpl;
-struct WebDropData;
namespace content {
class RenderViewHost;
@@ -31,11 +32,14 @@ typedef content::RenderViewHost* RenderViewHostIdentifier;
// Updated asynchronously during a drag to tell us whether or not we should
// allow the drop.
- NSDragOperation current_operation_;
+ NSDragOperation currentOperation_;
// Keep track of the render view host we're dragging over. If it changes
// during a drag, we need to re-send the DragEnter message.
RenderViewHostIdentifier currentRVH_;
+
+ // The data for the current drag, or NULL if none is in progress.
+ scoped_ptr<WebDropData> dropData_;
}
// |contents| is the WebContentsImpl representing this tab, used to communicate
@@ -43,6 +47,8 @@ typedef content::RenderViewHost* RenderViewHostIdentifier;
// (if necessary).
- (id)initWithWebContentsImpl:(WebContentsImpl*)contents;
+- (WebDropData*)currentDropData;
+
- (void)setDragDelegate:(content::WebDragDestDelegate*)delegate;
// Sets the current operation negotiated by the source and destination,
« no previous file with comments | « content/browser/web_contents/web_drag_dest_gtk.cc ('k') | content/browser/web_contents/web_drag_dest_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698