Chromium changes to use new WebKit, WebKitClient, and WebClipboard interfaces...

webkit/glue/simple_clipboard_impl.cc

 // Copyright (c) 2006-2008 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 "webkit/glue/webkit_glue.h"
 
 #include <string>
 
 #include "base/clipboard.h"
 #include "base/lazy_instance.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/scoped_clipboard_writer_glue.h"
 
 #include "SkBitmap.h"
 
 // Clipboard glue
 
-#if defined(OS_WIN)
-// The call is being made within the current process.
-void ScopedClipboardWriterGlue::WriteBitmap(const SkBitmap& bitmap) {
-  SkAutoLockPixels bitmap_lock(bitmap);
-  WriteBitmapFromPixels(bitmap.getPixels(), gfx::Size(bitmap.width(),
-                        bitmap.height()));
+void ScopedClipboardWriterGlue::WriteBitmapFromPixels(
+    const void* pixels, const gfx::Size& size) {
+  ScopedClipboardWriter::WriteBitmapFromPixels(pixels, size);
 }
-#endif  // defined(OS_WIN)
 
 ScopedClipboardWriterGlue::~ScopedClipboardWriterGlue() {
 }
 
 namespace webkit_glue {
 
 base::LazyInstance<Clipboard> clipboard(base::LINKER_INITIALIZED);
 
 Clipboard* ClipboardGetClipboard() {
   return clipboard.Pointer();
@@ skipping 12 matching lines @@
 }
 
 void ClipboardReadHTML(std::wstring* markup, GURL* url) {
   std::string url_str;
   ClipboardGetClipboard()->ReadHTML(markup, url ? &url_str : NULL);
   if (url)
     *url = GURL(url_str);
 }
 
 }  // namespace webkit_glue