summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-16 00:01:39 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-16 00:01:39 +0000
commit46c39f3ba687831eb0bdee81d7b893af50235110 (patch)
tree5299bb6ed1c065cf4035e38b493040d85ea26cc9 /webkit/glue
parent93dcf3daff5c052873091f7ed33b3a21b15a184f (diff)
downloadchromium_src-46c39f3ba687831eb0bdee81d7b893af50235110.zip
chromium_src-46c39f3ba687831eb0bdee81d7b893af50235110.tar.gz
chromium_src-46c39f3ba687831eb0bdee81d7b893af50235110.tar.bz2
Fix glue for ClipboardHostMsg_ReadAvailableTypes.
Since we no longer plan on using this message to service both drags and pasteboard requests, update the glue to call ui::base::Clipboard directly. Eventually, the remaining functions in ClipboardDispatcher will also be moved and/or deleted and the empty class removed. BUG=75237 TEST=none Review URL: http://codereview.chromium.org/6685063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webkit_glue.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index 68c3394..a860888 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -188,6 +188,11 @@ ui::Clipboard* ClipboardGetClipboard();
bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format,
ui::Clipboard::Buffer buffer);
+// Reads the available types from the clipboard, if available.
+void ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
+ std::vector<string16>* types,
+ bool* contains_filenames);
+
// Reads UNICODE text from the clipboard, if available.
void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result);
@@ -200,11 +205,6 @@ void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup,
void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data);
-// Reads the available types from the clipboard, if available.
-bool ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
- std::vector<string16>* types,
- bool* contains_filenames);
-
// Reads one type of data from the clipboard, if available.
bool ClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type,
string16* data, string16* metadata);