| 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..8a2955af6c4497e4cacee9ea3f7801ad782bb000 100644
|
| --- a/content/browser/web_contents/web_drag_dest_mac.h
|
| +++ b/content/browser/web_contents/web_drag_dest_mac.h
|
| @@ -5,9 +5,9 @@
|
| #import <Cocoa/Cocoa.h>
|
|
|
| #include "base/string16.h"
|
| +#include "webkit/glue/webdropdata.h"
|
|
|
| class WebContentsImpl;
|
| -struct WebDropData;
|
|
|
| namespace content {
|
| class RenderViewHost;
|
| @@ -31,11 +31,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 +46,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,
|
|
|