| Index: content/renderer/webclipboard_impl.h
|
| diff --git a/content/renderer/webclipboard_impl.h b/content/renderer/webclipboard_impl.h
|
| index 926ca2ca3f27a2890b0ec55c907b3bf7f972ff4c..477f53b08fb91ab15d7abfbc86a656e8fb4c65d6 100644
|
| --- a/content/renderer/webclipboard_impl.h
|
| +++ b/content/renderer/webclipboard_impl.h
|
| @@ -15,7 +15,7 @@
|
| namespace content {
|
| class ClipboardClient;
|
|
|
| -class WebClipboardImpl : public WebKit::WebClipboard {
|
| +class WebClipboardImpl : public blink::WebClipboard {
|
| public:
|
| explicit WebClipboardImpl(ClipboardClient* client);
|
|
|
| @@ -24,28 +24,28 @@ class WebClipboardImpl : public WebKit::WebClipboard {
|
| // WebClipboard methods:
|
| 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 void writePlainText(const WebKit::WebString& plain_text);
|
| + 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 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::ClipboardType*);
|
|
|