OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "base/clipboard.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 } | 26 } |
27 | 27 |
28 namespace webkit_glue { | 28 namespace webkit_glue { |
29 | 29 |
30 base::LazyInstance<Clipboard> clipboard(base::LINKER_INITIALIZED); | 30 base::LazyInstance<Clipboard> clipboard(base::LINKER_INITIALIZED); |
31 | 31 |
32 Clipboard* ClipboardGetClipboard() { | 32 Clipboard* ClipboardGetClipboard() { |
33 return clipboard.Pointer(); | 33 return clipboard.Pointer(); |
34 } | 34 } |
35 | 35 |
36 bool ClipboardIsFormatAvailable(const Clipboard::FormatType& format) { | 36 bool ClipboardIsFormatAvailable(const Clipboard::FormatType& format, |
37 return ClipboardGetClipboard()->IsFormatAvailable(format); | 37 Clipboard::Buffer buffer) { |
| 38 return ClipboardGetClipboard()->IsFormatAvailable(format, buffer); |
38 } | 39 } |
39 | 40 |
40 void ClipboardReadText(string16* result) { | 41 void ClipboardReadText(Clipboard::Buffer buffer, string16* result) { |
41 ClipboardGetClipboard()->ReadText(result); | 42 ClipboardGetClipboard()->ReadText(buffer, result); |
42 } | 43 } |
43 | 44 |
44 void ClipboardReadAsciiText(std::string* result) { | 45 void ClipboardReadAsciiText(Clipboard::Buffer buffer, std::string* result) { |
45 ClipboardGetClipboard()->ReadAsciiText(result); | 46 ClipboardGetClipboard()->ReadAsciiText(buffer, result); |
46 } | 47 } |
47 | 48 |
48 void ClipboardReadHTML(string16* markup, GURL* url) { | 49 void ClipboardReadHTML(Clipboard::Buffer buffer, string16* markup, GURL* url) { |
49 std::string url_str; | 50 std::string url_str; |
50 ClipboardGetClipboard()->ReadHTML(markup, url ? &url_str : NULL); | 51 ClipboardGetClipboard()->ReadHTML(buffer, markup, url ? &url_str : NULL); |
51 if (url) | 52 if (url) |
52 *url = GURL(url_str); | 53 *url = GURL(url_str); |
53 } | 54 } |
54 | 55 |
55 } // namespace webkit_glue | 56 } // namespace webkit_glue |
OLD | NEW |