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

3 files changed, 6 insertions, 13 deletions

diff --git a/ui/views/controls/message_box_view.cc b/ui/views/controls/message_box_view.cc
index ff7074b..bacad49 100644
--- a/ui/views/controls/message_box_view.cc
+++ b/ui/views/controls/message_box_view.cc
@@ -9,6 +9,7 @@
 #include "base/strings/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/image_view.h"
@@ -66,8 +67,7 @@ MessageBoxView::InitParams::InitParams(const string16& message)
     : options(NO_OPTIONS),
       message(message),
       message_width(kDefaultMessageWidth),
-      inter_row_vertical_spacing(kRelatedControlVerticalSpacing),
-      clipboard_source_tag() {}
+      inter_row_vertical_spacing(kRelatedControlVerticalSpacing) {}
 
 MessageBoxView::InitParams::~InitParams() {
 }
@@ -141,9 +141,7 @@ bool MessageBoxView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   if (!clipboard)
     return false;
 
-  ui::ScopedClipboardWriter scw(clipboard,
-                                ui::Clipboard::BUFFER_STANDARD,
-                                source_tag_);
+  ui::ScopedClipboardWriter scw(clipboard, ui::Clipboard::BUFFER_STANDARD);
   string16 text = message_labels_[0]->text();
   for (size_t i = 1; i < message_labels_.size(); ++i)
     text += message_labels_[i]->text();
@@ -189,7 +187,6 @@ void MessageBoxView::Init(const InitParams& params) {
   }
 
   inter_row_vertical_spacing_ = params.inter_row_vertical_spacing;
-  source_tag_ = params.clipboard_source_tag;
 
   ResetLayoutManager();
 }
diff --git a/ui/views/controls/message_box_view.h b/ui/views/controls/message_box_view.h
index 45a692e..db80767 100644
--- a/ui/views/controls/message_box_view.h
+++ b/ui/views/controls/message_box_view.h
@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "base/string16.h"
-#include "ui/base/clipboard/clipboard.h"
 #include "ui/views/view.h"
 
 namespace gfx {
@@ -49,7 +48,6 @@ class VIEWS_EXPORT MessageBoxView : public View {
     string16 default_prompt;
     int message_width;
     int inter_row_vertical_spacing;
-    ui::SourceTag clipboard_source_tag;
   };
 
   explicit MessageBoxView(const InitParams& params);
@@ -115,9 +113,6 @@ class VIEWS_EXPORT MessageBoxView : public View {
   // Spacing between rows in the grid layout.
   int inter_row_vertical_spacing_;
 
-  // Source tag to be written to the clipboard when Ctrl-C pressed.
-  ui::SourceTag source_tag_;
-
   DISALLOW_COPY_AND_ASSIGN(MessageBoxView);
 };
 
diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc
index 8a139cc..19abf6c 100644
--- a/ui/views/controls/textfield/native_textfield_win.cc
+++ b/ui/views/controls/textfield/native_textfield_win.cc
@@ -633,8 +633,9 @@ void NativeTextfieldWin::OnCopy() {
 
   const string16 text(GetSelectedText());
   if (!text.empty()) {
-    ui::ScopedClipboardWriter(ui::Clipboard::GetForCurrentThread(),
-                              ui::Clipboard::BUFFER_STANDARD).WriteText(text);
+    ui::ScopedClipboardWriter(
+        ui::Clipboard::GetForCurrentThread(),
+        ui::Clipboard::BUFFER_STANDARD).WriteText(text);
     if (TextfieldController* controller = textfield_->GetController())
       controller->OnAfterCutOrCopy();
   }