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

Side by Side Diff: webkit/glue/webkit_glue.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 | « webkit/glue/webclipboard_impl.cc ('k') | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 WEBKIT_GLUE_WEBKIT_GLUE_H_ 5 #ifndef WEBKIT_GLUE_WEBKIT_GLUE_H_
6 #define WEBKIT_GLUE_WEBKIT_GLUE_H_ 6 #define WEBKIT_GLUE_WEBKIT_GLUE_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 // Reads UNICODE text from the clipboard, if available. 191 // Reads UNICODE text from the clipboard, if available.
192 void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result); 192 void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result);
193 193
194 // Reads ASCII text from the clipboard, if available. 194 // Reads ASCII text from the clipboard, if available.
195 void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result); 195 void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result);
196 196
197 // Reads HTML from the clipboard, if available. 197 // Reads HTML from the clipboard, if available.
198 void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup, 198 void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup,
199 GURL* url); 199 GURL* url);
200 200
201 void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data);
202
203 // Reads the available types from the clipboard, if available. 201 // Reads the available types from the clipboard, if available.
204 bool ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer, 202 bool ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
205 std::vector<string16>* types, 203 std::vector<string16>* types,
206 bool* contains_filenames); 204 bool* contains_filenames);
207 205
208 // Reads one type of data from the clipboard, if available. 206 // Reads one type of data from the clipboard, if available.
209 bool ClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type, 207 bool ClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type,
210 string16* data, string16* metadata); 208 string16* data, string16* metadata);
211 209
212 // Reads filenames from the clipboard, if available. 210 // Reads filenames from the clipboard, if available.
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 bool GetFontTable(int fd, uint32_t table, uint8_t* output, 302 bool GetFontTable(int fd, uint32_t table, uint8_t* output,
305 size_t* output_length); 303 size_t* output_length);
306 #endif 304 #endif
307 305
308 // ---- END FUNCTIONS IMPLEMENTED BY EMBEDDER --------------------------------- 306 // ---- END FUNCTIONS IMPLEMENTED BY EMBEDDER ---------------------------------
309 307
310 308
311 } // namespace webkit_glue 309 } // namespace webkit_glue
312 310
313 #endif // WEBKIT_GLUE_WEBKIT_GLUE_H_ 311 #endif // WEBKIT_GLUE_WEBKIT_GLUE_H_
OLDNEW
« no previous file with comments | « webkit/glue/webclipboard_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698