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

Side by Side Diff: webkit/tools/test_shell/simple_clipboard_impl.cc

Issue 6685063: Fix glue for ClipboardHostMsg_ReadAvailableTypes. (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/webkit_glue.h ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #include "webkit/glue/webkit_glue.h" 5 #include "webkit/glue/webkit_glue.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 18 matching lines...) Expand all
29 29
30 ui::Clipboard* ClipboardGetClipboard() { 30 ui::Clipboard* ClipboardGetClipboard() {
31 return clipboard.Pointer(); 31 return clipboard.Pointer();
32 } 32 }
33 33
34 bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format, 34 bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format,
35 ui::Clipboard::Buffer buffer) { 35 ui::Clipboard::Buffer buffer) {
36 return ClipboardGetClipboard()->IsFormatAvailable(format, buffer); 36 return ClipboardGetClipboard()->IsFormatAvailable(format, buffer);
37 } 37 }
38 38
39 // TODO(dcheng): Implement.
40 void ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
41 std::vector<string16>* types,
42 bool* contains_filenames) {
43 return;
44 }
45
39 void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result) { 46 void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result) {
40 ClipboardGetClipboard()->ReadText(buffer, result); 47 ClipboardGetClipboard()->ReadText(buffer, result);
41 } 48 }
42 49
43 void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result) { 50 void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result) {
44 ClipboardGetClipboard()->ReadAsciiText(buffer, result); 51 ClipboardGetClipboard()->ReadAsciiText(buffer, result);
45 } 52 }
46 53
47 void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup, 54 void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup,
48 GURL* url) { 55 GURL* url) {
49 std::string url_str; 56 std::string url_str;
50 ClipboardGetClipboard()->ReadHTML(buffer, markup, url ? &url_str : NULL); 57 ClipboardGetClipboard()->ReadHTML(buffer, markup, url ? &url_str : NULL);
51 if (url) 58 if (url)
52 *url = GURL(url_str); 59 *url = GURL(url_str);
53 } 60 }
54 61
55 void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data) { 62 void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data) {
56 ClipboardGetClipboard()->ReadImage(buffer, data); 63 ClipboardGetClipboard()->ReadImage(buffer, data);
57 } 64 }
58 65
59 // TODO(dcheng): Implement.
60 bool ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
61 std::vector<string16>* types,
62 bool* contains_filenames) {
63 return false;
64 }
65
66 bool ClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type, 66 bool ClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type,
67 string16* data, string16* metadata) { 67 string16* data, string16* metadata) {
68 return false; 68 return false;
69 } 69 }
70 70
71 bool ClipboardReadFilenames(ui::Clipboard::Buffer buffer, 71 bool ClipboardReadFilenames(ui::Clipboard::Buffer buffer,
72 std::vector<string16>* filenames) { 72 std::vector<string16>* filenames) {
73 return false; 73 return false;
74 } 74 }
75 75
76 } // namespace webkit_glue 76 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698