Reintroduce password support to NativeTextfieldViews

ui/views/controls/textfield/textfield_views_model.cc

Index: ui/views/controls/textfield/textfield_views_model.cc
diff --git a/ui/views/controls/textfield/textfield_views_model.cc b/ui/views/controls/textfield/textfield_views_model.cc
index 77485c6616db42904df2bd61c4b20dffc29bfc23..f15658c45d631e05e5e30b38eddbfce012e6cb33 100644
--- a/ui/views/controls/textfield/textfield_views_model.cc
+++ b/ui/views/controls/textfield/textfield_views_model.cc
@@ -281,7 +281,6 @@ TextfieldViewsModel::Delegate::~Delegate() {
 TextfieldViewsModel::TextfieldViewsModel(Delegate* delegate)
     : delegate_(delegate),
       render_text_(gfx::RenderText::CreateRenderText()),
-      is_password_(false),
       current_edit_(edit_history_.end()) {
 }
 
@@ -505,12 +504,8 @@ bool TextfieldViewsModel::Redo() {
   return old != GetText() || old_cursor != GetCursorPosition();
 }
 
-string16 TextfieldViewsModel::GetVisibleText() const {
-  return GetVisibleText(0U, GetText().length());
-}
-
 bool TextfieldViewsModel::Cut() {
-  if (!HasCompositionText() && HasSelection()) {
+  if (!HasCompositionText() && HasSelection() && !render_text_->is_obscured()) {
     ui::ScopedClipboardWriter(views::ViewsDelegate::views_delegate
         ->GetClipboard()).WriteText(GetSelectedText());
     // A trick to let undo/redo handle cursor correctly.
@@ -527,7 +522,7 @@ bool TextfieldViewsModel::Cut() {
 }
 
 void TextfieldViewsModel::Copy() {
-  if (!HasCompositionText() && HasSelection()) {
+  if (!HasCompositionText() && HasSelection() && !render_text_->is_obscured()) {
     ui::ScopedClipboardWriter(views::ViewsDelegate::views_delegate
         ->GetClipboard()).WriteText(GetSelectedText());
   }
@@ -643,13 +638,6 @@ bool TextfieldViewsModel::HasCompositionText() const {
 /////////////////////////////////////////////////////////////////
 // TextfieldViewsModel: private
 
-string16 TextfieldViewsModel::GetVisibleText(size_t begin, size_t end) const {
-  DCHECK(end >= begin);
-  if (is_password_)
-    return string16(end - begin, '*');
-  return GetText().substr(begin, end - begin);
-}
-
 void TextfieldViewsModel::InsertTextInternal(const string16& text,
                                              bool mergeable) {
   if (HasCompositionText()) {