Reintroduce password support to NativeTextfieldViews

ui/views/controls/textfield/native_textfield_views.cc

 // Copyright (c) 2012 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 291 matching lines @@
   DCHECK_NE(ui::DragDropTypes::DRAG_NONE,
             GetDragOperationsForView(sender, press_pt));
   data->SetString(GetSelectedText());
   TextfieldController* controller = textfield_->GetController();
   if (controller)
     controller->OnWriteDragData(data);
 }
 
 int NativeTextfieldViews::GetDragOperationsForView(views::View* sender,
                                                    const gfx::Point& p) {
-  if (!textfield_->enabled() || !GetRenderText()->IsPointInSelection(p))
+  if (!textfield_->enabled() || textfield_->IsObscured() ||
+      !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 81 matching lines @@
   // For ChromeOS, we support a pre-defined font list per locale. UpdateFont()
   // only changes the font size, not the font family names.
   GetRenderText()->SetFontSize(textfield_->font().GetFontSize());
 #else
   GetRenderText()->SetFontList(gfx::FontList(textfield_->font()));
 #endif
   OnCaretBoundsChanged();
 }
 
 void NativeTextfieldViews::UpdateIsObscured() {
-  // TODO(benrg): GetRenderText()->SetObscured(textfield_->IsObscured());
+  GetRenderText()->SetObscured(textfield_->IsObscured());
   OnCaretBoundsChanged();
   SchedulePaint();
   OnTextInputTypeChanged();
 }
 
 void NativeTextfieldViews::UpdateEnabled() {
   SetEnabled(textfield_->enabled());
   SchedulePaint();
   OnTextInputTypeChanged();
 }
@@ skipping 120 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_->IsObscured();
     case IDS_APP_COPY:
-      return model_->HasSelection();
+      return model_->HasSelection() && !textfield_->IsObscured();
     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:
       return textfield_->GetController()->IsCommandIdEnabled(command_id);
   }
 }
 
 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();
   OnBeforeUserAction();
-  switch (command_id) {
-    case IDS_APP_CUT:
-      if (editable)
+  if (IsCommandIdEnabled(command_id)) {
+    switch (command_id) {
+      case IDS_APP_CUT:
         text_changed = Cut();
-      break;
-    case IDS_APP_COPY:
-      Copy();
-      break;
-    case IDS_APP_PASTE:
-      if (editable)
+        break;
+      case IDS_APP_COPY:
+        Copy();
+        break;
+      case IDS_APP_PASTE:
         text_changed = Paste();
-      break;
-    case IDS_APP_DELETE:
-      if (editable)
+        break;
+      case IDS_APP_DELETE:
         text_changed = model_->Delete();
-      break;
-    case IDS_APP_SELECT_ALL:
-      SelectAll();
-      break;
-    default:
-      textfield_->GetController()->ExecuteCommand(command_id);
-      break;
+        break;
+      case IDS_APP_SELECT_ALL:
+        SelectAll();
+        break;
+      default:
+        textfield_->GetController()->ExecuteCommand(command_id);
+        break;
+    }
   }
 
   // The cursor must have changed if text changed during cut/paste/delete.
   UpdateAfterChange(text_changed, text_changed);

[xji, 2012/02/25 00:06:14]

UpdateAfterChange() could be moved inside the 'if' statement.

do we need "OnBeforeUserAction()" and "OnAfterUserAction" if 
"IsCommandIdEnabled() == false"?

[benrg, 2012/03/01 17:18:00]

Done.
I don't know. Oshima, do you know?

[xji, 2012/03/01 19:33:49]

looks like you forgot.

[benrg, 2012/03/01 21:07:52]

Oshima says no, so changed.

On 2012/03/01 19:33:49, xji wrote:
Actually done.

   OnAfterUserAction();
 }
 
 void NativeTextfieldViews::ApplyStyleRange(const gfx::StyleRange& style) {
   GetRenderText()->ApplyStyleRange(style);
   SchedulePaint();
 }
 
 void NativeTextfieldViews::ApplyDefaultStyle() {
   GetRenderText()->ApplyDefaultStyle();
@@ skipping 215 matching lines @@
 bool NativeTextfieldViews::HandleKeyEvent(const KeyEvent& key_event) {
   // TODO(oshima): Refactor and consolidate with ExecuteCommand.
   if (key_event.type() == ui::ET_KEY_PRESSED) {
     ui::KeyboardCode key_code = key_event.key_code();
     // TODO(oshima): shift-tab does not work. Figure out why and fix.
     if (key_code == ui::VKEY_TAB)
       return false;
 
     OnBeforeUserAction();
     bool editable = !textfield_->read_only();
+    bool readable = !textfield_->IsObscured();
     bool selection = key_event.IsShiftDown();
     bool control = key_event.IsControlDown();
     bool text_changed = false;
     bool cursor_changed = false;
     switch (key_code) {
       case ui::VKEY_Z:
         if (control && editable)
           cursor_changed = text_changed = model_->Undo();
         break;
       case ui::VKEY_Y:
         if (control && editable)
           cursor_changed = text_changed = model_->Redo();
         break;
       case ui::VKEY_A:
         if (control) {
           model_->SelectAll();
           cursor_changed = true;
         }
         break;
       case ui::VKEY_X:
-        if (control && editable)
+        if (control && editable && readable)
           cursor_changed = text_changed = Cut();
         break;
       case ui::VKEY_C:
-        if (control)
+        if (control && readable)
           Copy();
         break;
       case ui::VKEY_V:
         if (control && editable)
           cursor_changed = text_changed = Paste();
         break;
       case ui::VKEY_RIGHT:
       case ui::VKEY_LEFT:
         model_->MoveCursor(
             control ? gfx::WORD_BREAK : gfx::CHARACTER_BREAK,
@@ skipping 247 matching lines @@
 
 #if defined(USE_AURA)
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   return new NativeTextfieldViews(field);
 }
 #endif
 
 }  // namespace views