Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Side by Side Diff: webkit/glue/webclipboard_impl.h

Issue 6698011: Revert r78134+r78136 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/base/clipboard/clipboard_win.cc ('k') | webkit/glue/webclipboard_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WEBCLIPBOARD_IMPL_H_ 5 #ifndef WEBCLIPBOARD_IMPL_H_
6 #define WEBCLIPBOARD_IMPL_H_ 6 #define WEBCLIPBOARD_IMPL_H_
7 7
8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebClipboard.h" 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebClipboard.h"
9 #include "ui/base/clipboard/clipboard.h" 9 #include "ui/base/clipboard/clipboard.h"
10 10
11 #include <string> 11 #include <string>
12 12
13 namespace webkit_glue { 13 namespace webkit_glue {
14 14
15 class WebClipboardImpl : public WebKit::WebClipboard { 15 class WebClipboardImpl : public WebKit::WebClipboard {
16 public: 16 public:
17 static std::string URLToMarkup(const WebKit::WebURL& url, 17 static std::string URLToMarkup(const WebKit::WebURL& url,
18 const WebKit::WebString& title); 18 const WebKit::WebString& title);
19 static std::string URLToImageMarkup(const WebKit::WebURL& url, 19 static std::string URLToImageMarkup(const WebKit::WebURL& url,
20 const WebKit::WebString& title); 20 const WebKit::WebString& title);
21 21
22 virtual ~WebClipboardImpl(); 22 virtual ~WebClipboardImpl();
23 23
24 // WebClipboard methods: 24 // WebClipboard methods:
25 virtual bool isFormatAvailable(Format, Buffer); 25 virtual bool isFormatAvailable(Format, Buffer);
26 virtual WebKit::WebString readPlainText(Buffer); 26 virtual WebKit::WebString readPlainText(Buffer);
27 virtual WebKit::WebString readHTML(Buffer, WebKit::WebURL* source_url); 27 virtual WebKit::WebString readHTML(Buffer, WebKit::WebURL* source_url);
28 virtual WebKit::WebData readImage(Buffer);
29 virtual void writeHTML( 28 virtual void writeHTML(
30 const WebKit::WebString& html_text, 29 const WebKit::WebString& html_text,
31 const WebKit::WebURL& source_url, 30 const WebKit::WebURL& source_url,
32 const WebKit::WebString& plain_text, 31 const WebKit::WebString& plain_text,
33 bool write_smart_paste); 32 bool write_smart_paste);
34 virtual void writePlainText(const WebKit::WebString& plain_text); 33 virtual void writePlainText(const WebKit::WebString& plain_text);
35 virtual void writeURL( 34 virtual void writeURL(
36 const WebKit::WebURL&, 35 const WebKit::WebURL&,
37 const WebKit::WebString& title); 36 const WebKit::WebString& title);
38 virtual void writeImage( 37 virtual void writeImage(
(...skipping 11 matching lines...) Expand all
50 WebKit::WebString* data, WebKit::WebString* metadata); 49 WebKit::WebString* data, WebKit::WebString* metadata);
51 virtual WebKit::WebVector<WebKit::WebString> readFilenames(Buffer); 50 virtual WebKit::WebVector<WebKit::WebString> readFilenames(Buffer);
52 51
53 private: 52 private:
54 bool ConvertBufferType(Buffer, ui::Clipboard::Buffer*); 53 bool ConvertBufferType(Buffer, ui::Clipboard::Buffer*);
55 }; 54 };
56 55
57 } // namespace webkit_glue 56 } // namespace webkit_glue
58 57
59 #endif // WEBCLIPBOARD_IMPL_H_ 58 #endif // WEBCLIPBOARD_IMPL_H_
OLDNEW
« no previous file with comments | « ui/base/clipboard/clipboard_win.cc ('k') | webkit/glue/webclipboard_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698