Revert 113040 - Enable custom MIME types in web copy/paste.

ui/base/clipboard/clipboard_mac.mm

 // Copyright (c) 2011 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.
 
 #include "ui/base/clipboard/clipboard.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/base/clipboard/custom_data_helper.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 #include "ui/gfx/size.h"
 
 namespace ui {
 
 namespace {
 
 // Would be nice if this were in UTCoreTypes.h, but it isn't
 NSString* const kUTTypeURLName = @"public.url-name";
 
 // Tells us if WebKit was the last to write to the pasteboard. There's no
 // actual data associated with this type.
 NSString* const kWebSmartPastePboardType = @"NeXT smart paste pasteboard type";
 
-// TODO(dcheng): This name is temporary. See crbug.com/106449.
-NSString* const kWebCustomDataType = @"org.chromium.web-custom-data";
-
 NSPasteboard* GetPasteboard() {
   // The pasteboard should not be nil in a UI session, but this handy DCHECK
   // can help track down problems if someone tries using clipboard code outside
   // of a UI session.
   NSPasteboard* pasteboard = [NSPasteboard generalPasteboard];
   DCHECK(pasteboard);
   return pasteboard;
 }
 
 }  // namespace
@@ skipping 174 matching lines @@
   }
 
   types->clear();
   if (IsFormatAvailable(Clipboard::GetPlainTextFormatType(), buffer))
     types->push_back(UTF8ToUTF16(kMimeTypeText));
   if (IsFormatAvailable(Clipboard::GetHtmlFormatType(), buffer))
     types->push_back(UTF8ToUTF16(kMimeTypeHTML));
   if ([NSImage canInitWithPasteboard:GetPasteboard()])
     types->push_back(UTF8ToUTF16(kMimeTypePNG));
   *contains_filenames = false;
-
-  NSPasteboard* pb = GetPasteboard();
-  if ([[pb types] containsObject:kWebCustomDataType]) {
-    NSData* data = [pb dataForType:kWebCustomDataType];
-    if ([data length])
-      ReadCustomDataTypes([data bytes], [data length], types);
-  }
 }
 
 void Clipboard::ReadText(Clipboard::Buffer buffer, string16* result) const {
   DCHECK_EQ(buffer, BUFFER_STANDARD);
   NSPasteboard* pb = GetPasteboard();
   NSString* contents = [pb stringForType:NSStringPboardType];
 
   UTF8ToUTF16([contents UTF8String],
               [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
               result);
@@ skipping 65 matching lines @@
              fromRect:NSZeroRect
             operation:NSCompositeCopy
              fraction:1.0];
   }
   return canvas.ExtractBitmap();
 }
 
 void Clipboard::ReadCustomData(Buffer buffer,
                                const string16& type,
                                string16* result) const {
-  DCHECK_EQ(buffer, BUFFER_STANDARD);
-
-  NSPasteboard* pb = GetPasteboard();
-  if ([[pb types] containsObject:kWebCustomDataType]) {
-    NSData* data = [pb dataForType:kWebCustomDataType];
-    if ([data length])
-      ReadCustomDataForType([data bytes], [data length], type, result);
-  }
+  // TODO(dcheng): Implement this.
+  NOTIMPLEMENTED();
 }
 
 void Clipboard::ReadBookmark(string16* title, std::string* url) const {
   NSPasteboard* pb = GetPasteboard();
 
   if (title) {
     NSString* contents = [pb stringForType:kUTTypeURLName];
     UTF8ToUTF16([contents UTF8String],
                 [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
                 title);
@@ skipping 85 matching lines @@
 // static
 Clipboard::FormatType Clipboard::GetBitmapFormatType() {
   return base::SysNSStringToUTF8(NSTIFFPboardType);
 }
 
 // static
 Clipboard::FormatType Clipboard::GetWebKitSmartPasteFormatType() {
   return base::SysNSStringToUTF8(kWebSmartPastePboardType);
 }
 
-// static
-Clipboard::FormatType Clipboard::GetWebCustomDataFormatType() {
-  return base::SysNSStringToUTF8(kWebCustomDataType);
-}
-
 }  // namespace ui