Reintroduce password support to NativeTextfieldViews

ui/views/controls/textfield/native_textfield_views.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 281 matching lines @@
 void NativeTextfieldViews::WriteDragDataForView(views::View* sender,
                                                 const gfx::Point& press_pt,
                                                 OSExchangeData* data) {
   DCHECK_NE(ui::DragDropTypes::DRAG_NONE,
             GetDragOperationsForView(sender, press_pt));
   data->SetString(GetSelectedText());
 }
 
 int NativeTextfieldViews::GetDragOperationsForView(views::View* sender,
                                                    const gfx::Point& p) {
-  if (!textfield_->IsEnabled() || !GetRenderText()->IsPointInSelection(p))
+  if (!textfield_->IsEnabled() || textfield_->IsPassword()
+          || !GetRenderText()->IsPointInSelection(p))
     return ui::DragDropTypes::DRAG_NONE;
   if (sender == this && !textfield_->read_only())
     return ui::DragDropTypes::DRAG_MOVE | ui::DragDropTypes::DRAG_COPY;
   return ui::DragDropTypes::DRAG_COPY;
 }
 
 bool NativeTextfieldViews::CanStartDragForView(View* sender,
                                                const gfx::Point& press_pt,
                                                const gfx::Point& p) {
   return GetRenderText()->IsPointInSelection(press_pt);
@@ skipping 78 matching lines @@
   // Update the default text style.
   gfx::StyleRange default_style(GetRenderText()->default_style());
   default_style.font = textfield_->font();
   GetRenderText()->set_default_style(default_style);
   GetRenderText()->ApplyDefaultStyle();
 
   OnCaretBoundsChanged();
 }
 
 void NativeTextfieldViews::UpdateIsPassword() {
-  model_->set_is_password(textfield_->IsPassword());
+  GetRenderText()->SetIsObscured(textfield_->IsPassword());
   OnCaretBoundsChanged();
   SchedulePaint();
   OnTextInputTypeChanged();
 }
 
 void NativeTextfieldViews::UpdateEnabled() {
   SetEnabled(textfield_->IsEnabled());
   SchedulePaint();
   OnTextInputTypeChanged();
 }
@@ skipping 114 matching lines @@
 
 bool NativeTextfieldViews::IsCommandIdChecked(int command_id) const {
   return true;
 }
 
 bool NativeTextfieldViews::IsCommandIdEnabled(int command_id) const {
   bool editable = !textfield_->read_only();
   string16 result;
   switch (command_id) {
     case IDS_APP_CUT:
-      return editable && model_->HasSelection();
+      return editable && model_->HasSelection() && !textfield_->IsPassword();

[oshima, 2011/12/06 23:57:18]

I assume you'll change IsPassword in another CL?

[benrg, 2011/12/08 21:40:55]

It's changed in 8748001, which should land someday...

     case IDS_APP_COPY:
-      return model_->HasSelection();
+      return model_->HasSelection() && !textfield_->IsPassword();
     case IDS_APP_PASTE:
       ViewsDelegate::views_delegate->GetClipboard()
           ->ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
       return editable && !result.empty();
     case IDS_APP_DELETE:
       return editable && model_->HasSelection();
     case IDS_APP_SELECT_ALL:
       return true;
     default:
       NOTREACHED();
       return false;
   }
 }
 
 bool NativeTextfieldViews::GetAcceleratorForCommandId(int command_id,
     ui::Accelerator* accelerator) {
   return false;
 }
 
 void NativeTextfieldViews::ExecuteCommand(int command_id) {
   bool text_changed = false;
-  bool editable = !textfield_->read_only();

[oshima, 2011/12/06 23:57:18]

won't this break read_only behavior?

[benrg, 2011/12/08 21:40:55]

I thought ExecuteCommand is only called when a menu item is chosen, which should
never happen when IsCommandIdEnabled returns false. In the next patch set I
added a release-build sanity check. If I'm missing something please let me know.

+  DCHECK(IsCommandIdEnabled(command_id));
   OnBeforeUserAction();
   switch (command_id) {
     case IDS_APP_CUT:
-      if (editable)
-        text_changed = model_->Cut();
+      text_changed = model_->Cut();
       break;
     case IDS_APP_COPY:
       model_->Copy();
       break;
     case IDS_APP_PASTE:
-      if (editable)
-        text_changed = Paste();
+      text_changed = Paste();
       break;
     case IDS_APP_DELETE:
-      if (editable)
-        text_changed = model_->Delete();
+      text_changed = model_->Delete();
       break;
     case IDS_APP_SELECT_ALL:
       SelectAll();
       break;
     default:
       NOTREACHED() << "unknown command: " << command_id;
       break;
   }
 
   // The cursor must have changed if text changed during cut/paste/delete.
@@ skipping 489 matching lines @@
 
 #if defined(USE_AURA)
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   return new NativeTextfieldViews(field);
 }
 #endif
 
 }  // namespace views