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

2 files changed, 12 insertions, 12 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);
diff --git a/webkit/tools/test_shell/simple_clipboard_impl.cc b/webkit/tools/test_shell/simple_clipboard_impl.cc
index cf7c43b..cd12ded 100644
--- a/webkit/tools/test_shell/simple_clipboard_impl.cc
+++ b/webkit/tools/test_shell/simple_clipboard_impl.cc
@@ -36,6 +36,13 @@ bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format,
   return ClipboardGetClipboard()->IsFormatAvailable(format, buffer);
 }
 
+// TODO(dcheng): Implement.
+void ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
+                                 std::vector<string16>* types,
+                                 bool* contains_filenames) {
+  return;
+}
+
 void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result) {
   ClipboardGetClipboard()->ReadText(buffer, result);
 }
@@ -56,13 +63,6 @@ void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data) {
   ClipboardGetClipboard()->ReadImage(buffer, data);
 }
 
-// TODO(dcheng): Implement.
-bool ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
-                                 std::vector<string16>* types,
-                                 bool* contains_filenames) {
-  return false;
-}
-
 bool ClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type,
                        string16* data, string16* metadata) {
   return false;