| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "webkit/glue/webkit_glue.h" | 5 #include "webkit/glue/webkit_glue.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/clipboard.h" | 9 #include "app/clipboard/clipboard.h" |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| 11 #include "base/string16.h" | 11 #include "base/string16.h" |
| 12 #include "googleurl/src/gurl.h" | 12 #include "googleurl/src/gurl.h" |
| 13 #include "third_party/skia/include/core/SkBitmap.h" | 13 #include "third_party/skia/include/core/SkBitmap.h" |
| 14 #include "webkit/glue/scoped_clipboard_writer_glue.h" | 14 #include "webkit/glue/scoped_clipboard_writer_glue.h" |
| 15 | 15 |
| 16 // Clipboard glue | 16 // Clipboard glue |
| 17 | 17 |
| 18 #if defined(OS_WIN) | 18 #if defined(OS_WIN) |
| 19 void ScopedClipboardWriterGlue::WriteBitmapFromPixels( | 19 void ScopedClipboardWriterGlue::WriteBitmapFromPixels( |
| (...skipping 27 matching lines...) Expand all Loading... |
| 47 } | 47 } |
| 48 | 48 |
| 49 void ClipboardReadHTML(Clipboard::Buffer buffer, string16* markup, GURL* url) { | 49 void ClipboardReadHTML(Clipboard::Buffer buffer, string16* markup, GURL* url) { |
| 50 std::string url_str; | 50 std::string url_str; |
| 51 ClipboardGetClipboard()->ReadHTML(buffer, markup, url ? &url_str : NULL); | 51 ClipboardGetClipboard()->ReadHTML(buffer, markup, url ? &url_str : NULL); |
| 52 if (url) | 52 if (url) |
| 53 *url = GURL(url_str); | 53 *url = GURL(url_str); |
| 54 } | 54 } |
| 55 | 55 |
| 56 } // namespace webkit_glue | 56 } // namespace webkit_glue |
| OLD | NEW |