| 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 5c509865363922aef86cd3dc26459aa4ad7eea88..9fb7a933a6fb5ed5f7e0ab67a3c9b48f245282c5 100644
|
| --- a/ui/views/controls/textfield/textfield_views_model.cc
|
| +++ b/ui/views/controls/textfield/textfield_views_model.cc
|
| @@ -277,7 +277,6 @@ TextfieldViewsModel::Delegate::~Delegate() {
|
| TextfieldViewsModel::TextfieldViewsModel(Delegate* delegate)
|
| : delegate_(delegate),
|
| render_text_(gfx::RenderText::CreateRenderText()),
|
| - is_password_(false),
|
| current_edit_(edit_history_.end()) {
|
| }
|
|
|
| @@ -501,12 +500,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_password()) {
|
| ui::ScopedClipboardWriter(views::ViewsDelegate::views_delegate
|
| ->GetClipboard()).WriteText(GetSelectedText());
|
| // A trick to let undo/redo handle cursor correctly.
|
| @@ -523,7 +518,7 @@ bool TextfieldViewsModel::Cut() {
|
| }
|
|
|
| void TextfieldViewsModel::Copy() {
|
| - if (!HasCompositionText() && HasSelection()) {
|
| + if (!HasCompositionText() && HasSelection() && !render_text_->is_password()) {
|
| ui::ScopedClipboardWriter(views::ViewsDelegate::views_delegate
|
| ->GetClipboard()).WriteText(GetSelectedText());
|
| }
|
| @@ -639,13 +634,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()) {
|
|
|