Revert the feature 'Clear the clipboard upon exit from Incognito'. Original patches:

https://chromiumcodereview.appspot.com/12041078
https://chromiumcodereview.appspot.com/12313102
https://chromiumcodereview.appspot.com/12445003
https://chromiumcodereview.appspot.com/12317146
https://chromiumcodereview.appspot.com/13042009
https://chromiumcodereview.appspot.com/12837002


TBR=jrg@chromium.org
BUG=242767

Review URL: https://chromiumcodereview.appspot.com/15690011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203627 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 27 deletions

diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index 2935ea2..e7dec5e 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -225,9 +225,7 @@ Clipboard::~Clipboard() {
   clipboard_owner_ = NULL;
 }
 
-void Clipboard::WriteObjectsImpl(Buffer buffer,
-                                 const ObjectMap& objects,
-                                 SourceTag tag) {
+void Clipboard::WriteObjects(Buffer buffer, const ObjectMap& objects) {
   DCHECK_EQ(buffer, BUFFER_STANDARD);
 
   ScopedClipboard clipboard;
@@ -240,7 +238,6 @@ void Clipboard::WriteObjectsImpl(Buffer buffer,
        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) {
@@ -380,13 +377,6 @@ void Clipboard::WriteData(const FormatType& format,
   WriteToClipboard(format.ToUINT(), hdata);
 }
 
-void Clipboard::WriteSourceTag(SourceTag tag) {
-  if (tag != SourceTag()) {
-    ObjectMapParam binary = SourceTag2Binary(tag);
-    WriteData(GetSourceTagFormatType(), &binary[0], binary.size());
-  }
-}
-
 void Clipboard::WriteToClipboard(unsigned int format, HANDLE handle) {
   DCHECK(clipboard_owner_);
   if (handle && !::SetClipboardData(format, handle)) {
@@ -677,13 +667,6 @@ void Clipboard::ReadData(const FormatType& format, std::string* result) const {
   ::GlobalUnlock(data);
 }
 
-SourceTag Clipboard::ReadSourceTag(Buffer buffer) const {
-  DCHECK_EQ(buffer, BUFFER_STANDARD);
-  std::string result;
-  ReadData(GetSourceTagFormatType(), &result);
-  return Binary2SourceTag(result);
-}
-
 // static
 void Clipboard::ParseBookmarkClipboardFormat(const string16& bookmark,
                                              string16* title,
@@ -834,15 +817,6 @@ const Clipboard::FormatType& Clipboard::GetPepperCustomDataFormatType() {
 }
 
 // static
-const Clipboard::FormatType& Clipboard::GetSourceTagFormatType() {
-  CR_DEFINE_STATIC_LOCAL(
-      FormatType,
-      type,
-      (::RegisterClipboardFormat(L"Chromium Source tag Format")));
-  return type;
-}
-
-// static
 void Clipboard::FreeData(unsigned int format, HANDLE data) {
   if (format == CF_BITMAP)
     ::DeleteObject(static_cast<HBITMAP>(data));