Index: content/renderer/clipboard_client.h |
diff --git a/content/renderer/clipboard_client.h b/content/renderer/clipboard_client.h |
index 14a00076092691daf0bd416c119e4c5316c8f69c..ebb253a0d373e4167628b291a785be6d59b8fa1d 100644 |
--- a/content/renderer/clipboard_client.h |
+++ b/content/renderer/clipboard_client.h |
@@ -5,6 +5,7 @@ |
#ifndef CONTENT_RENDERER_CLIPBOARD_CLIENT_H_ |
#define CONTENT_RENDERER_CLIPBOARD_CLIENT_H_ |
+#include "content/common/clipboard_message_enums.h" |
#include "ui/base/clipboard/clipboard.h" |
class GURL; |
@@ -36,7 +37,7 @@ class ClipboardClient { |
virtual uint64 GetSequenceNumber(ui::ClipboardType type) = 0; |
// Tests whether the clipboard contains a certain format |
- virtual bool IsFormatAvailable(const ui::Clipboard::FormatType& format, |
+ virtual bool IsFormatAvailable(content::ClipboardFormat format, |
jam
2014/03/20 16:07:08
nit: no "content::" since this is in the content n
dcheng
2014/03/20 17:52:06
Done.
|
ui::ClipboardType type) = 0; |
// Clear the contents of the clipboard. |
@@ -47,14 +48,11 @@ class ClipboardClient { |
std::vector<base::string16>* types, |
bool* contains_filenames) = 0; |
- // Reads UNICODE text from the clipboard, if available. |
+ // Reads text from the clipboard, trying UNICODE first, then falling back to |
+ // ASCII. |
virtual void ReadText(ui::ClipboardType type, |
base::string16* result) = 0; |
- // Reads ASCII text from the clipboard, if available. |
- virtual void ReadAsciiText(ui::ClipboardType type, |
- std::string* result) = 0; |
- |
// Reads HTML from the clipboard, if available. |
virtual void ReadHTML(ui::ClipboardType type, |
base::string16* markup, |