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

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

Issue 12298037: Revert 183123 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1417/src/
Patch Set: Created 7 years, 10 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 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 183210)
+++ ui/base/clipboard/clipboard_mac.mm (working copy)
@@ -26,9 +26,6 @@
namespace {
-// Source tag format type.
-NSString* const kSourceTagPboardType = @"org.chromium.source-tag-data";
-
// Would be nice if this were in UTCoreTypes.h, but it isn't
NSString* const kUTTypeURLName = @"public.url-name";
@@ -93,9 +90,7 @@
DCHECK(CalledOnValidThread());
}
-void Clipboard::WriteObjectsImpl(Buffer buffer,
- const ObjectMap& objects,
- SourceTag tag) {
+void Clipboard::WriteObjects(Buffer buffer, const ObjectMap& objects) {
DCHECK(CalledOnValidThread());
DCHECK_EQ(buffer, BUFFER_STANDARD);
@@ -106,7 +101,6 @@
iter != objects.end(); ++iter) {
DispatchObject(static_cast<ObjectType>(iter->first), iter->second);
}
- WriteSourceTag(tag);
}
void Clipboard::WriteText(const char* text_data, size_t text_len) {
@@ -218,13 +212,6 @@
forType:format.ToNSString()];
}
-void Clipboard::WriteSourceTag(SourceTag tag) {
- if (tag != SourceTag()) {
- ObjectMapParam binary = SourceTag2Binary(tag);
- WriteData(GetSourceTagFormatType(), &binary[0], binary.size());
- }
-}
-
// Write an extra flavor that signifies WebKit was the last to modify the
// pasteboard. This flavor has no data.
void Clipboard::WriteWebSmartPaste() {
@@ -423,13 +410,6 @@
result->assign(static_cast<const char*>([data bytes]), [data length]);
}
-Clipboard::SourceTag Clipboard::ReadSourceTag(Buffer buffer) const {
- DCHECK_EQ(buffer, BUFFER_STANDARD);
- std::string result;
- ReadData(GetSourceTagFormatType(), &result);
- return Binary2SourceTag(result);
-}
-
// static
Clipboard::FormatType Clipboard::GetFormatType(
const std::string& format_string) {
@@ -505,10 +485,4 @@
return type;
}
-// static
-const Clipboard::FormatType& Clipboard::GetSourceTagFormatType() {
- CR_DEFINE_STATIC_LOCAL(FormatType, type, (kSourceTagPboardType));
- return type;
-}
-
} // namespace ui
« 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