Remove ui::TextEditCommand::DELETE_SELECTION.

ui/views/controls/textfield/textfield.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/textfield.h"
 
 #include <string>
 #include <utility>
 
 #include "base/trace_event/trace_event.h"
@@ skipping 257 matching lines @@
   return ui::TextEditCommand::INVALID_COMMAND;
 }
 #endif
 
 const gfx::FontList& GetDefaultFontList() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetFontListWithDelta(ui::kLabelFontSizeDelta);
 }
 
 // Returns the ui::TextEditCommand corresponding to the |command_id| menu
-// action. Keep in sync with UpdateContextMenu.
-ui::TextEditCommand GetTextEditCommandFromMenuCommand(int command_id) {
+// action. |has_selection| is true if the textfield has an active selection.
+// Keep in sync with UpdateContextMenu.
+ui::TextEditCommand GetTextEditCommandFromMenuCommand(int command_id,
+                                                      bool has_selection) {
   switch (command_id) {
     case IDS_APP_UNDO:
       return ui::TextEditCommand::UNDO;
     case IDS_APP_CUT:
       return ui::TextEditCommand::CUT;
     case IDS_APP_COPY:
       return ui::TextEditCommand::COPY;
     case IDS_APP_PASTE:
       return ui::TextEditCommand::PASTE;
     case IDS_APP_DELETE:
-      return ui::TextEditCommand::DELETE_SELECTION;
+      // The DELETE menu action only works in case of an active selection.
+      if (has_selection)
+        return ui::TextEditCommand::DELETE_FORWARD;
+      break;
     case IDS_APP_SELECT_ALL:
       return ui::TextEditCommand::SELECT_ALL;
-    default:
-      return ui::TextEditCommand::INVALID_COMMAND;
   }
+  return ui::TextEditCommand::INVALID_COMMAND;
 }
 
 }  // namespace
 
 // static
 const char Textfield::kViewClassName[] = "Textfield";
 const int Textfield::kTextPadding = 3;
 
 // static
 size_t Textfield::GetCaretBlinkMs() {
@@ skipping 959 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // Textfield, ui::SimpleMenuModel::Delegate overrides:
 
 bool Textfield::IsCommandIdChecked(int command_id) const {
   return true;
 }
 
 bool Textfield::IsCommandIdEnabled(int command_id) const {
   return Textfield::IsTextEditCommandEnabled(
-      GetTextEditCommandFromMenuCommand(command_id));
+      GetTextEditCommandFromMenuCommand(command_id, HasSelection()));
 }
 
 bool Textfield::GetAcceleratorForCommandId(int command_id,
                                            ui::Accelerator* accelerator) {
   switch (command_id) {
     case IDS_APP_UNDO:
       *accelerator = ui::Accelerator(ui::VKEY_Z, ui::EF_CONTROL_DOWN);
       return true;
 
     case IDS_APP_CUT:
@@ skipping 12 matching lines @@
       *accelerator = ui::Accelerator(ui::VKEY_A, ui::EF_CONTROL_DOWN);
       return true;
 
     default:
       return false;
   }
 }
 
 void Textfield::ExecuteCommand(int command_id, int event_flags) {
   Textfield::ExecuteTextEditCommand(
-      GetTextEditCommandFromMenuCommand(command_id));
+      GetTextEditCommandFromMenuCommand(command_id, HasSelection()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Textfield, ui::TextInputClient overrides:
 
 void Textfield::SetCompositionText(const ui::CompositionText& composition) {
   if (GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE)
     return;
 
   OnBeforeUserAction();
@@ skipping 220 matching lines @@
     case ui::TextEditCommand::REDO:
       return editable && model_->CanRedo();
     case ui::TextEditCommand::CUT:
       return editable && readable && model_->HasSelection();
     case ui::TextEditCommand::COPY:
       return readable && model_->HasSelection();
     case ui::TextEditCommand::PASTE:
       ui::Clipboard::GetForCurrentThread()->ReadText(
           ui::CLIPBOARD_TYPE_COPY_PASTE, &result);
       return editable && !result.empty();
-    case ui::TextEditCommand::DELETE_SELECTION:
-      return editable && model_->HasSelection();
     case ui::TextEditCommand::SELECT_ALL:
       return !text().empty();
     case ui::TextEditCommand::DELETE_FORWARD:
     case ui::TextEditCommand::DELETE_BACKWARD:
     case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE:
     case ui::TextEditCommand::DELETE_TO_END_OF_LINE:
     case ui::TextEditCommand::DELETE_WORD_BACKWARD:
     case ui::TextEditCommand::DELETE_WORD_FORWARD:
       return editable;
     case ui::TextEditCommand::MOVE_LEFT:
@@ skipping 91 matching lines @@
       break;
     case ui::TextEditCommand::CUT:
       text_changed = cursor_changed = Cut();
       break;
     case ui::TextEditCommand::COPY:
       Copy();
       break;
     case ui::TextEditCommand::PASTE:
       text_changed = cursor_changed = Paste();
       break;
-    case ui::TextEditCommand::DELETE_SELECTION:
-      text_changed = cursor_changed = model_->Delete();
-      break;
     case ui::TextEditCommand::SELECT_ALL:
       SelectAll(false);
       break;
     case ui::TextEditCommand::DELETE_BACKWARD:
       text_changed = cursor_changed = model_->Backspace();
       break;
     case ui::TextEditCommand::DELETE_FORWARD:
       text_changed = cursor_changed = model_->Delete();
       break;
     case ui::TextEditCommand::DELETE_TO_END_OF_LINE:
@@ skipping 317 matching lines @@
     RequestFocus();
   model_->MoveCursorTo(mouse);
   if (!selection_clipboard_text.empty()) {
     model_->InsertText(selection_clipboard_text);
     UpdateAfterChange(true, true);
   }
   OnAfterUserAction();
 }
 
 }  // namespace views