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

Unified Diff: ui/base/clipboard/clipboard_mac.mm

Issue 8801015: Revert 112986 - Implement Clipboard::ReadData and Clipboard::WriteData for Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/clipboard/clipboard_gtk.cc ('k') | ui/base/clipboard/clipboard_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_mac.mm
===================================================================
--- ui/base/clipboard/clipboard_mac.mm (revision 112992)
+++ ui/base/clipboard/clipboard_mac.mm (working copy)
@@ -153,15 +153,6 @@
}
}
-void Clipboard::WriteData(const char* format_name, size_t format_len,
- const char* data_data, size_t data_len) {
- NSPasteboard* pb = GetPasteboard();
- NSString* format = [NSString stringWithUTF8String:format_name];
- [pb addTypes:[NSArray arrayWithObject:format] owner:nil];
- [pb setData:[NSData dataWithBytes:data_data length:data_len]
- forType:format];
-}
-
// Write an extra flavor that signifies WebKit was the last to modify the
// pasteboard. This flavor has no data.
void Clipboard::WriteWebSmartPaste() {
@@ -179,7 +170,7 @@
}
bool Clipboard::IsFormatAvailable(const Clipboard::FormatType& format,
- Buffer buffer) const {
+ Clipboard::Buffer buffer) const {
DCHECK_EQ(buffer, BUFFER_STANDARD);
NSString* format_ns = base::SysUTF8ToNSString(format);
@@ -195,17 +186,6 @@
return [types containsObject:format_ns];
}
-bool Clipboard::IsFormatAvailableByString(const std::string& format,
- Buffer buffer) const {
- DCHECK_EQ(buffer, BUFFER_STANDARD);
- NSString* format_ns = base::SysUTF8ToNSString(format);
-
- NSPasteboard* pb = GetPasteboard();
- NSArray* types = [pb types];
-
- return [types containsObject:format_ns];
-}
-
void Clipboard::ReadAvailableTypes(Clipboard::Buffer buffer,
std::vector<string16>* types,
bool* contains_filenames) const {
@@ -362,13 +342,6 @@
}
}
-void Clipboard::ReadData(const std::string& format, std::string* result) const {
- NSPasteboard* pb = GetPasteboard();
- NSData* data = [pb dataForType:base::SysUTF8ToNSString(format)];
- if ([data length])
- result->assign(reinterpret_cast<const char*>([data bytes]), [data length]);
-}
-
// static
Clipboard::FormatType Clipboard::GetUrlFormatType() {
return base::SysNSStringToUTF8(NSURLPboardType);
« no previous file with comments | « ui/base/clipboard/clipboard_gtk.cc ('k') | ui/base/clipboard/clipboard_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698