Plumb through buffer type for clipboard sequence number requests.

Some minor cleanup to remove BUFFER_DRAG as well, which is not used anywhere.

BUG=73478
TEST=compiles

Review URL: http://codereview.chromium.org/8511042

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109476 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 18 insertions, 11 deletions

diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc
index 888de27..03614b0 100644
--- a/webkit/glue/webclipboard_impl.cc
+++ b/webkit/glue/webclipboard_impl.cc
@@ -64,7 +64,15 @@ WebClipboardImpl::~WebClipboardImpl() {
 }
 
 uint64 WebClipboardImpl::getSequenceNumber() {
-  return ClipboardGetSequenceNumber();
+  return sequenceNumber(BufferStandard);
+}
+
+uint64 WebClipboardImpl::sequenceNumber(Buffer buffer) {
+  ui::Clipboard::Buffer buffer_type;
+  if (!ConvertBufferType(buffer, &buffer_type))
+    return 0;
+
+  return ClipboardGetSequenceNumber(buffer_type);
 }
 
 bool WebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) {
@@ -218,8 +226,6 @@ bool WebClipboardImpl::ConvertBufferType(Buffer buffer,
     case BufferStandard:
       *result = ui::Clipboard::BUFFER_STANDARD;
       break;
-    case BufferDrag:
-      *result = ui::Clipboard::BUFFER_DRAG;
     case BufferSelection:
 #if defined(USE_X11)
       *result = ui::Clipboard::BUFFER_SELECTION;
diff --git a/webkit/glue/webclipboard_impl.h b/webkit/glue/webclipboard_impl.h
index e0bc399..6b496b6 100644
--- a/webkit/glue/webclipboard_impl.h
+++ b/webkit/glue/webclipboard_impl.h
@@ -23,16 +23,17 @@ class WebClipboardImpl : public WebKit::WebClipboard {
 
   // WebClipboard methods:
   virtual uint64 getSequenceNumber();
-  virtual bool isFormatAvailable(Format, Buffer);
+  virtual uint64 sequenceNumber(Buffer buffer);
+  virtual bool isFormatAvailable(Format format, Buffer buffer);
   virtual WebKit::WebVector<WebKit::WebString> readAvailableTypes(
-      Buffer, bool* contains_filenames);
-  virtual WebKit::WebString readPlainText(Buffer);
+      Buffer buffer, bool* contains_filenames);
+  virtual WebKit::WebString readPlainText(Buffer buffer);
   virtual WebKit::WebString readHTML(
-      Buffer,
+      Buffer buffer,
       WebKit::WebURL* source_url,
       unsigned* fragment_start,
       unsigned* fragment_end);
-  virtual WebKit::WebData readImage(Buffer);
+  virtual WebKit::WebData readImage(Buffer buffer);
   virtual void writeHTML(
       const WebKit::WebString& html_text,
       const WebKit::WebURL& source_url,
@@ -40,10 +41,10 @@ class WebClipboardImpl : public WebKit::WebClipboard {
       bool write_smart_paste);
   virtual void writePlainText(const WebKit::WebString& plain_text);
   virtual void writeURL(
-      const WebKit::WebURL&,
+      const WebKit::WebURL& url,
       const WebKit::WebString& title);
   virtual void writeImage(
-      const WebKit::WebImage&,
+      const WebKit::WebImage& image,
       const WebKit::WebURL& source_url,
       const WebKit::WebString& title);
 
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index e4a5ab0..5c8efba 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -174,7 +174,7 @@ base::StringPiece GetDataResource(int resource_id);
 ui::Clipboard* ClipboardGetClipboard();
 
 // Get a sequence number which uniquely identifies clipboard state.
-uint64 ClipboardGetSequenceNumber();
+uint64 ClipboardGetSequenceNumber(ui::Clipboard::Buffer buffer);
 
 // Tests whether the clipboard contains a certain format
 bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format,