Mac: *Correctly* fill file extension as drag source.

chrome/browser/cocoa/web_drag_source.mm

 // Copyright (c) 2009 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 "chrome/browser/cocoa/web_drag_source.h"
 
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
@@ skipping 11 matching lines @@
 
 using base::SysNSStringToUTF8;
 using base::SysUTF8ToNSString;
 using base::SysUTF16ToNSString;
 using net::FileStream;
 
 
 namespace {
 
 // Make a drag image from the drop data.
-// TODO(viettrungluu@gmail.com): Move this somewhere more sensible.
+// TODO(viettrungluu): Move this somewhere more sensible.
 NSImage* MakeDragImage(const WebDropData* drop_data) {
-  // TODO(viettrungluu@gmail.com): Just a stub for now. Make it do something.
+  // TODO(viettrungluu): Just a stub for now. Make it do something (see, e.g.,
+  // WebKit/WebKit/mac/Misc/WebNSViewExtras.m: |-_web_DragImageForElement:...|).
 
   // Default to returning a generic image.
   return nsimage_cache::ImageNamed(@"nav.pdf");
 }
 
 // Returns a filename appropriate for the drop data (of form "FILENAME-seq.EXT"
 // if seq > 0).
-// TODO(viettrungluu@gmail.com): Refactor to make it common across platforms,
+// TODO(viettrungluu): Refactor to make it common across platforms,
 // and move it somewhere sensible.
 FilePath GetFileNameFromDragData(
     const WebDropData& drop_data, unsigned seq) {
   // Images without ALT text will only have a file extension so we need to
   // synthesize one from the provided extension and URL.
   FilePath file_name([SysUTF16ToNSString(drop_data.file_description_filename)
           fileSystemRepresentation]);
   file_name = file_name.BaseName().RemoveExtension();
 
   if (file_name.empty()) {
@@ skipping 111 matching lines @@
     DCHECK(dropData_->url.is_valid());
     [pboard     setURLs:[NSArray
         arrayWithObject:SysUTF8ToNSString(dropData_->url.spec())]
              withTitles:[NSArray arrayWithObject:
                             SysUTF16ToNSString(dropData_->url_title)]];
 
   // File contents.
   } else if ([type isEqualToString:NSFileContentsPboardType] ||
       [type isEqualToString:NSCreateFileContentsPboardType(
               SysUTF16ToNSString(dropData_->file_extension))]) {
-    // TODO(viettrungluu@gmail.com): find something which is known to accept
+    // TODO(viettrungluu: find something which is known to accept
     // NSFileContentsPboardType to check that this actually works!
     scoped_nsobject<NSFileWrapper> file_wrapper(
         [[NSFileWrapper alloc] initRegularFileWithContents:[NSData
                 dataWithBytes:dropData_->file_contents.data()
                        length:dropData_->file_contents.length()]]);
     [file_wrapper setPreferredFilename:SysUTF8ToNSString(
             GetFileNameFromDragData(*dropData_, 0).value())];
     [pboard writeFileWrapper:file_wrapper];
 
   // TIFF.
   } else if ([type isEqualToString:NSTIFFPboardType]) {
-    // FIXME(viettrungluu@gmail.com): This is a bit odd since we rely on Cocoa
-    // to render our image into a TIFF. This is also suboptimal since this is
-    // all done synchronously. I'm not sure there's much we can easily do about
-    // it.
+    // TODO(viettrungluu): This is a bit odd since we rely on Cocoa to render
+    // our image into a TIFF. This is also suboptimal since this is all done
+    // synchronously. I'm not sure there's much we can easily do about it.
     scoped_nsobject<NSImage> image(
         [[NSImage alloc] initWithData:[NSData
                 dataWithBytes:dropData_->file_contents.data()
                        length:dropData_->file_contents.length()]]);
     [pboard setData:[image TIFFRepresentation] forType:NSTIFFPboardType];
 
   // Plain text.
   } else if ([type isEqualToString:NSStringPboardType]) {
     DCHECK(!dropData_->plain_text.empty());
     [pboard setString:SysUTF16ToNSString(dropData_->plain_text)
@@ skipping 126 matching lines @@
     [pasteboard_ addTypes:[NSArray arrayWithObject:NSHTMLPboardType]
                     owner:contentsView_];
 
   // URL.
   if (dropData_->url.is_valid())
     [pasteboard_ addTypes:[NSArray arrayWithObject:NSURLPboardType]
                     owner:contentsView_];
 
   // File.
   if (!dropData_->file_contents.empty()) {
-    NSString* file_ext = SysUTF16ToNSString(dropData_->file_extension);
+    // |dropData_->file_extension| comes with the '.', which we must strip.
+    NSString* fileExtension =
+        (dropData_->file_extension.length() > 0) ?
+        SysUTF16ToNSString(dropData_->file_extension.substr(1)) : @"";
 
     // File contents (with and without specific type), file (HFS) promise, TIFF.
-    // TODO(viettrungluu@gmail.com): others?
+    // TODO(viettrungluu): others?
     [pasteboard_ addTypes:[NSArray arrayWithObjects:
                                   NSFileContentsPboardType,
-                                  NSCreateFileContentsPboardType(file_ext),
+                                  NSCreateFileContentsPboardType(fileExtension),
                                   NSFilesPromisePboardType,
                                   NSTIFFPboardType,
                                   nil]
                     owner:contentsView_];
 
     // For the file promise, we need to specify the extension.
-    [pasteboard_ setPropertyList:[NSArray arrayWithObject:file_ext]
+    [pasteboard_ setPropertyList:[NSArray arrayWithObject:fileExtension]
                          forType:NSFilesPromisePboardType];
   }
 
   // Plain text.
   if (!dropData_->plain_text.empty())
     [pasteboard_ addTypes:[NSArray arrayWithObject:NSStringPboardType]
                     owner:contentsView_];
 }
 
 - (NSImage*)dragImage {
   return MakeDragImage(dropData_.get());
 }
 
 @end  // @implementation WebDragSource (Private)