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

Unified Diff: content/browser/web_contents/web_contents_view_mac.mm

Issue 18281002: Move WebDropData to content::DropData and split off conversion function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Mac build error. Created 7 years, 6 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_contents_view_mac.mm
diff --git a/content/browser/web_contents/web_contents_view_mac.mm b/content/browser/web_contents/web_contents_view_mac.mm
index 7d65bcf061c2711641b2d7641167c198ee841966..cb9f274e6d2b4adb0bab5d308c91fe1ac6ddf763 100644
--- a/content/browser/web_contents/web_contents_view_mac.mm
+++ b/content/browser/web_contents/web_contents_view_mac.mm
@@ -30,6 +30,7 @@
using WebKit::WebDragOperation;
using WebKit::WebDragOperationsMask;
+using content::DropData;
using content::PopupMenuHelper;
using content::RenderViewHostFactory;
using content::RenderWidgetHostView;
@@ -55,8 +56,8 @@ COMPILE_ASSERT_MATCHING_ENUM(DragOperationEvery);
- (id)initWithWebContentsViewMac:(WebContentsViewMac*)w;
- (void)registerDragTypes;
- (void)setCurrentDragOperation:(NSDragOperation)operation;
-- (WebDropData*)dropData;
-- (void)startDragWithDropData:(const WebDropData&)dropData
+- (DropData*)dropData;
+- (void)startDragWithDropData:(const DropData&)dropData
dragOperationMask:(NSDragOperation)operationMask
image:(NSImage*)image
offset:(NSPoint)offset;
@@ -124,7 +125,7 @@ void WebContentsViewMac::GetContainerBounds(gfx::Rect* out) const {
}
void WebContentsViewMac::StartDragging(
- const WebDropData& drop_data,
+ const DropData& drop_data,
WebDragOperationsMask allowed_operations,
const gfx::ImageSkia& image,
const gfx::Vector2d& image_offset,
@@ -204,7 +205,7 @@ void WebContentsViewMac::RestoreFocus() {
focus_tracker_.reset(nil);
}
-WebDropData* WebContentsViewMac::GetDropData() const {
+DropData* WebContentsViewMac::GetDropData() const {
return [cocoa_view_ dropData];
}
@@ -425,7 +426,7 @@ void WebContentsViewMac::CloseTab() {
[dragDest_ setCurrentOperation:operation];
}
-- (WebDropData*)dropData {
+- (DropData*)dropData {
return [dragDest_ currentDropData];
}
@@ -467,7 +468,7 @@ void WebContentsViewMac::CloseTab() {
forType:type];
}
-- (void)startDragWithDropData:(const WebDropData&)dropData
+- (void)startDragWithDropData:(const DropData&)dropData
dragOperationMask:(NSDragOperation)operationMask
image:(NSImage*)image
offset:(NSPoint)offset {
« no previous file with comments | « content/browser/web_contents/web_contents_view_mac.h ('k') | content/browser/web_contents/web_contents_view_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698