1 files changed, 17 insertions, 22 deletions
diff --git a/chromium/content/renderer/webclipboard_impl.h b/chromium/content/renderer/webclipboard_impl.h
index e5a12aa47bd..477f53b08fb 100644
--- a/chromium/content/renderer/webclipboard_impl.h
+++ b/chromium/content/renderer/webclipboard_impl.h
@@ -15,48 +15,43 @@
 namespace content {
 class ClipboardClient;
 
-class WebClipboardImpl : public WebKit::WebClipboard {
+class WebClipboardImpl : public blink::WebClipboard {
  public:
   explicit WebClipboardImpl(ClipboardClient* client);
 
   virtual ~WebClipboardImpl();
 
   // WebClipboard methods:
-  virtual uint64 getSequenceNumber();
   virtual uint64 sequenceNumber(Buffer buffer);
   virtual bool isFormatAvailable(Format format, Buffer buffer);
-  virtual WebKit::WebVector<WebKit::WebString> readAvailableTypes(
+  virtual blink::WebVector<blink::WebString> readAvailableTypes(
       Buffer buffer, bool* contains_filenames);
-  virtual WebKit::WebString readPlainText(Buffer buffer);
-  virtual WebKit::WebString readHTML(
+  virtual blink::WebString readPlainText(Buffer buffer);
+  virtual blink::WebString readHTML(
       Buffer buffer,
-      WebKit::WebURL* source_url,
+      blink::WebURL* source_url,
       unsigned* fragment_start,
       unsigned* fragment_end);
-  virtual WebKit::WebData readImage(Buffer buffer);
-  virtual WebKit::WebString readCustomData(
-      Buffer buffer, const WebKit::WebString& type);
+  virtual blink::WebData readImage(Buffer buffer);
+  virtual blink::WebString readCustomData(
+      Buffer buffer, const blink::WebString& type);
+  virtual void writePlainText(const blink::WebString& plain_text);
   virtual void writeHTML(
-      const WebKit::WebString& html_text,
-      const WebKit::WebURL& source_url,
-      const WebKit::WebString& plain_text,
+      const blink::WebString& html_text,
+      const blink::WebURL& source_url,
+      const blink::WebString& plain_text,
       bool write_smart_paste);
-  virtual void writePlainText(const WebKit::WebString& plain_text);
-  virtual void writeURL(
-      const WebKit::WebURL& url,
-      const WebKit::WebString& title);
   virtual void writeImage(
-      const WebKit::WebImage& image,
-      const WebKit::WebURL& source_url,
-      const WebKit::WebString& title);
-  virtual void writeDataObject(const WebKit::WebDragData& data);
+      const blink::WebImage& image,
+      const blink::WebURL& source_url,
+      const blink::WebString& title);
+  virtual void writeDataObject(const blink::WebDragData& data);
 
  private:
-  bool ConvertBufferType(Buffer, ui::Clipboard::Buffer*);
+  bool ConvertBufferType(Buffer, ui::ClipboardType*);
   ClipboardClient* client_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_WEBCLIPBOARD_IMPL_H_
-