Move WebDropData to content::DropData and split off conversion function.

content/browser/web_contents/web_contents_view_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Carbon/Carbon.h>
 
 #import "content/browser/web_contents/web_contents_view_mac.h"
 
 #include <string>
 
@@ skipping 12 matching lines @@
 #include "content/public/browser/web_contents_view_delegate.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #include "ui/base/clipboard/custom_data_helper.h"
 #import "ui/base/cocoa/focus_tracker.h"
 #include "ui/base/dragdrop/cocoa_dnd_util.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
+using content::DropData;
 using content::PopupMenuHelper;
 using content::RenderViewHostFactory;
 using content::RenderWidgetHostView;
 using content::RenderWidgetHostViewMac;
 using content::WebContents;
 using content::WebContentsImpl;
 using content::WebContentsViewMac;
 
 // Ensure that the WebKit::WebDragOperation enum values stay in sync with
 // NSDragOperation constants, since the code below static_casts between 'em.
 #define COMPILE_ASSERT_MATCHING_ENUM(name) \
   COMPILE_ASSERT(int(NS##name) == int(WebKit::Web##name), enum_mismatch_##name)
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationNone);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationCopy);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationLink);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationGeneric);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationPrivate);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationMove);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationDelete);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationEvery);
 
 @interface WebContentsViewCocoa (Private)
 - (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;
 - (void)cancelDeferredClose;
 - (void)clearWebContentsView;
 - (void)closeTabAfterEvent;
 - (void)viewDidBecomeFirstResponder:(NSNotification*)notification;
 @end
 
 namespace content {
@@ skipping 47 matching lines @@
   bounds.origin = [window convertBaseToScreen:bounds.origin];
 
   // Flip y to account for screen flip.
   NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
   bounds.origin.y = [screen frame].size.height - bounds.origin.y
       - bounds.size.height;
   *out = gfx::Rect(NSRectToCGRect(bounds));
 }
 
 void WebContentsViewMac::StartDragging(
-    const WebDropData& drop_data,
+    const DropData& drop_data,
     WebDragOperationsMask allowed_operations,
     const gfx::ImageSkia& image,
     const gfx::Vector2d& image_offset,
     const DragEventSourceInfo& event_info) {
   // By allowing nested tasks, the code below also allows Close(),
   // which would deallocate |this|.  The same problem can occur while
   // processing -sendEvent:, so Close() is deferred in that case.
   // Drags from web content do not come via -sendEvent:, this sets the
   // same flag -sendEvent: would.
   base::mac::ScopedSendingEvent sending_event_scoper;
@@ skipping 59 matching lines @@
     // TODO(shess): If location-bar gets focus by default, this will
     // select-all in the field.  If there was a specific selection in
     // the field when we navigated away from it, we should restore
     // that selection.
     SetInitialFocus();
   }
 
   focus_tracker_.reset(nil);
 }
 
-WebDropData* WebContentsViewMac::GetDropData() const {
+DropData* WebContentsViewMac::GetDropData() const {
   return [cocoa_view_ dropData];
 }
 
 void WebContentsViewMac::UpdateDragCursor(WebDragOperation operation) {
   [cocoa_view_ setCurrentDragOperation: operation];
 }
 
 void WebContentsViewMac::GotFocus() {
   // This is only used in the views FocusManager stuff but it bleeds through
   // all subclasses. http://crbug.com/21875
@@ skipping 200 matching lines @@
       NSFilenamesPboardType,
       ui::kWebCustomDataPboardType,
       nil];
   [self registerForDraggedTypes:types];
 }
 
 - (void)setCurrentDragOperation:(NSDragOperation)operation {
   [dragDest_ setCurrentOperation:operation];
 }
 
-- (WebDropData*)dropData {
+- (DropData*)dropData {
   return [dragDest_ currentDropData];
 }
 
 - (WebContentsImpl*)webContents {
   if (webContentsView_ == NULL)
     return NULL;
   return webContentsView_->web_contents();
 }
 
 - (void)mouseEvent:(NSEvent*)theEvent {
@@ skipping 21 matching lines @@
   // saves us the effort of overriding this method in every possible
   // subview.
   return mouseDownCanMoveWindow_;
 }
 
 - (void)pasteboard:(NSPasteboard*)sender provideDataForType:(NSString*)type {
   [dragSource_ lazyWriteToPasteboard:sender
                              forType:type];
 }
 
-- (void)startDragWithDropData:(const WebDropData&)dropData
+- (void)startDragWithDropData:(const DropData&)dropData
             dragOperationMask:(NSDragOperation)operationMask
                         image:(NSImage*)image
                        offset:(NSPoint)offset {
   dragSource_.reset([[WebDragSource alloc]
       initWithContents:[self webContents]
                   view:self
               dropData:&dropData
                  image:image
                 offset:offset
             pasteboard:[NSPasteboard pasteboardWithName:NSDragPboard]
@@ skipping 73 matching lines @@
       [[[notification userInfo] objectForKey:kSelectionDirection]
         unsignedIntegerValue];
   if (direction == NSDirectSelection)
     return;
 
   [self webContents]->
       FocusThroughTabTraversal(direction == NSSelectingPrevious);
 }
 
 @end