Unify ui::TextEditCommand and ui::TextEditCommandAuraLinux::CommandId.

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 149 matching lines @@
     case ui::VKEY_INSERT:
       if (control && !shift)
         return ui::TextEditCommand::COPY;
       return (shift && !control) ? ui::TextEditCommand::PASTE
                                  : ui::TextEditCommand::INVALID_COMMAND;
     default:
       return ui::TextEditCommand::INVALID_COMMAND;
   }
 }
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-// Convert a custom text edit |command| to the equivalent views command ID.
-ui::TextEditCommand GetViewsCommand(const ui::TextEditCommandAuraLinux& command,
-                                    bool rtl) {
-  const bool select = command.extend_selection();
-  switch (command.command_id()) {
-    case ui::TextEditCommandAuraLinux::COPY:
-      return ui::TextEditCommand::COPY;
-    case ui::TextEditCommandAuraLinux::CUT:
-      return ui::TextEditCommand::CUT;
-    case ui::TextEditCommandAuraLinux::DELETE_BACKWARD:
-      return ui::TextEditCommand::DELETE_BACKWARD;
-    case ui::TextEditCommandAuraLinux::DELETE_FORWARD:
-      return ui::TextEditCommand::DELETE_FORWARD;
-    case ui::TextEditCommandAuraLinux::DELETE_TO_BEGINNING_OF_LINE:
-    case ui::TextEditCommandAuraLinux::DELETE_TO_BEGINNING_OF_PARAGRAPH:
-      return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE;
-    case ui::TextEditCommandAuraLinux::DELETE_TO_END_OF_LINE:
-    case ui::TextEditCommandAuraLinux::DELETE_TO_END_OF_PARAGRAPH:
-      return ui::TextEditCommand::DELETE_TO_END_OF_LINE;
-    case ui::TextEditCommandAuraLinux::DELETE_WORD_BACKWARD:
-      return ui::TextEditCommand::DELETE_WORD_BACKWARD;
-    case ui::TextEditCommandAuraLinux::DELETE_WORD_FORWARD:
-      return ui::TextEditCommand::DELETE_WORD_FORWARD;
-    case ui::TextEditCommandAuraLinux::INSERT_TEXT:
-      return ui::TextEditCommand::INVALID_COMMAND;
-    case ui::TextEditCommandAuraLinux::MOVE_BACKWARD:
-      if (rtl)
-        return select ? ui::TextEditCommand::MOVE_RIGHT_AND_MODIFY_SELECTION
-                      : ui::TextEditCommand::MOVE_RIGHT;
-      return select ? ui::TextEditCommand::MOVE_LEFT_AND_MODIFY_SELECTION
-                    : ui::TextEditCommand::MOVE_LEFT;
-    case ui::TextEditCommandAuraLinux::MOVE_DOWN:
-      return ui::TextEditCommand::MOVE_DOWN;
-    case ui::TextEditCommandAuraLinux::MOVE_FORWARD:
-      if (rtl)
-        return select ? ui::TextEditCommand::MOVE_LEFT_AND_MODIFY_SELECTION
-                      : ui::TextEditCommand::MOVE_LEFT;
-      return select ? ui::TextEditCommand::MOVE_RIGHT_AND_MODIFY_SELECTION
-                    : ui::TextEditCommand::MOVE_RIGHT;
-    case ui::TextEditCommandAuraLinux::MOVE_LEFT:
-      return select ? ui::TextEditCommand::MOVE_LEFT_AND_MODIFY_SELECTION
-                    : ui::TextEditCommand::MOVE_LEFT;
-    case ui::TextEditCommandAuraLinux::MOVE_PAGE_DOWN:
-    case ui::TextEditCommandAuraLinux::MOVE_PAGE_UP:
-      return ui::TextEditCommand::INVALID_COMMAND;
-    case ui::TextEditCommandAuraLinux::MOVE_RIGHT:
-      return select ? ui::TextEditCommand::MOVE_RIGHT_AND_MODIFY_SELECTION
-                    : ui::TextEditCommand::MOVE_RIGHT;
-    case ui::TextEditCommandAuraLinux::MOVE_TO_BEGINNING_OF_DOCUMENT:
-    case ui::TextEditCommandAuraLinux::MOVE_TO_BEGINNING_OF_LINE:
-    case ui::TextEditCommandAuraLinux::MOVE_TO_BEGINNING_OF_PARAGRAPH:
-      return select ? ui::TextEditCommand::
-                          MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
-                    : ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE;
-    case ui::TextEditCommandAuraLinux::MOVE_TO_END_OF_DOCUMENT:
-    case ui::TextEditCommandAuraLinux::MOVE_TO_END_OF_LINE:
-    case ui::TextEditCommandAuraLinux::MOVE_TO_END_OF_PARAGRAPH:
-      return select
-                 ? ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION
-                 : ui::TextEditCommand::MOVE_TO_END_OF_LINE;
-    case ui::TextEditCommandAuraLinux::MOVE_UP:
-      return ui::TextEditCommand::MOVE_UP;
-    case ui::TextEditCommandAuraLinux::MOVE_WORD_BACKWARD:
-      if (rtl) {
-        return select
-                   ? ui::TextEditCommand::MOVE_WORD_RIGHT_AND_MODIFY_SELECTION
-                   : ui::TextEditCommand::MOVE_WORD_RIGHT;
-      }
-      return select ? ui::TextEditCommand::MOVE_WORD_LEFT_AND_MODIFY_SELECTION
-                    : ui::TextEditCommand::MOVE_WORD_LEFT;
-    case ui::TextEditCommandAuraLinux::MOVE_WORD_FORWARD:
-      if (rtl) {
-        return select ? ui::TextEditCommand::MOVE_WORD_LEFT_AND_MODIFY_SELECTION
-                      : ui::TextEditCommand::MOVE_WORD_LEFT;
-      }
-      return select ? ui::TextEditCommand::MOVE_WORD_RIGHT_AND_MODIFY_SELECTION
-                    : ui::TextEditCommand::MOVE_WORD_RIGHT;
-    case ui::TextEditCommandAuraLinux::MOVE_WORD_LEFT:
-      return select ? ui::TextEditCommand::MOVE_WORD_LEFT_AND_MODIFY_SELECTION
-                    : ui::TextEditCommand::MOVE_WORD_LEFT;
-    case ui::TextEditCommandAuraLinux::MOVE_WORD_RIGHT:
-      return select ? ui::TextEditCommand::MOVE_WORD_RIGHT_AND_MODIFY_SELECTION
-                    : ui::TextEditCommand::MOVE_WORD_RIGHT;
-    case ui::TextEditCommandAuraLinux::PASTE:
-      return ui::TextEditCommand::PASTE;
-    case ui::TextEditCommandAuraLinux::SELECT_ALL:
-      return ui::TextEditCommand::SELECT_ALL;
-    case ui::TextEditCommandAuraLinux::SET_MARK:
-    case ui::TextEditCommandAuraLinux::UNSELECT:
-    case ui::TextEditCommandAuraLinux::INVALID_COMMAND:
-      return ui::TextEditCommand::INVALID_COMMAND;
-  }
-  NOTREACHED();
-  return ui::TextEditCommand::INVALID_COMMAND;
-}
-#endif
-
 const gfx::FontList& GetDefaultFontList() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetFontListWithDelta(ui::kLabelFontSizeDelta);
 }
 
 // Returns ui::TextEditCommand corresponding to |command_id| menu 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) {
@@ skipping 472 matching lines @@
   bool handled = controller_ && controller_->HandleKeyEvent(this, event);
 
   if (!textfield)
     return handled;
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
       ui::GetTextEditKeyBindingsDelegate();
   std::vector<ui::TextEditCommandAuraLinux> commands;
   if (!handled && delegate && delegate->MatchEvent(event, &commands)) {
-    const bool rtl = GetTextDirection() == base::i18n::RIGHT_TO_LEFT;
     for (size_t i = 0; i < commands.size(); ++i) {
-      const ui::TextEditCommand command = GetViewsCommand(commands[i], rtl);
+      const ui::TextEditCommand command = commands[i].command();

[msw, 2016/06/10 01:33:23]

optional nit: inline this.

[karandeepb, 2016/06/15 08:13:34]

Done.

       if (IsEditCommandEnabled(command)) {
         ExecuteEditCommand(command);
         handled = true;
       }
     }
     return handled;
   }
 #endif
 
   if (edit_command == ui::TextEditCommand::INVALID_COMMAND)
@@ skipping 116 matching lines @@
   SelectAll(false);
 }
 
 bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // Skip any accelerator handling that conflicts with custom keybindings.
   ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
       ui::GetTextEditKeyBindingsDelegate();
   std::vector<ui::TextEditCommandAuraLinux> commands;
   if (delegate && delegate->MatchEvent(event, &commands)) {
-    const bool rtl = GetTextDirection() == base::i18n::RIGHT_TO_LEFT;
     for (size_t i = 0; i < commands.size(); ++i)
-      if (IsEditCommandEnabled(GetViewsCommand(commands[i], rtl)))
+      if (IsEditCommandEnabled(commands[i].command()))
         return true;
   }
 #endif
 
   // Skip backspace accelerator handling; editable textfields handle this key.
   // Also skip processing Windows [Alt]+<num-pad digit> Unicode alt-codes.
   const bool is_backspace = event.key_code() == ui::VKEY_BACK;
   return (is_backspace && !read_only()) || event.IsUnicodeKeyCode();
 }
 
@@ skipping 635 matching lines @@
           ui::CLIPBOARD_TYPE_COPY_PASTE, &result);
       return editable && !result.empty();
     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:
+    case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_PARAGRAPH:
+    case ui::TextEditCommand::DELETE_TO_END_OF_PARAGRAPH:
       return editable;
     case ui::TextEditCommand::MOVE_LEFT:
     case ui::TextEditCommand::MOVE_LEFT_AND_MODIFY_SELECTION:
     case ui::TextEditCommand::MOVE_RIGHT:
     case ui::TextEditCommand::MOVE_RIGHT_AND_MODIFY_SELECTION:
     case ui::TextEditCommand::MOVE_WORD_LEFT:
     case ui::TextEditCommand::MOVE_WORD_LEFT_AND_MODIFY_SELECTION:
     case ui::TextEditCommand::MOVE_WORD_RIGHT:
     case ui::TextEditCommand::MOVE_WORD_RIGHT_AND_MODIFY_SELECTION:
     case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE:
     case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION:
     case ui::TextEditCommand::MOVE_TO_END_OF_LINE:
     case ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_FORWARD:
+    case ui::TextEditCommand::MOVE_BACKWARD:
+    case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_DOCUMENT:
+    case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_PARAGRAPH:
+    case ui::TextEditCommand::MOVE_TO_END_OF_DOCUMENT:
+    case ui::TextEditCommand::MOVE_TO_END_OF_PARAGRAPH:
+    case ui::TextEditCommand::MOVE_WORD_BACKWARD:
+    case ui::TextEditCommand::MOVE_WORD_FORWARD:
+    case ui::TextEditCommand::MOVE_BACKWARD_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_FORWARD_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::
+        MOVE_TO_BEGINNING_OF_DOCUMENT_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::
+        MOVE_TO_BEGINNING_OF_PARAGRAPH_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_TO_END_OF_DOCUMENT_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_TO_END_OF_PARAGRAPH_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_WORD_BACKWARD_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_WORD_FORWARD_AND_MODIFY_SELECTION:
       return true;
     case ui::TextEditCommand::MOVE_UP:
     case ui::TextEditCommand::MOVE_DOWN:
+    case ui::TextEditCommand::MOVE_UP_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_DOWN_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::INSERT_TEXT:
+    case ui::TextEditCommand::MOVE_PAGE_DOWN:
+    case ui::TextEditCommand::MOVE_PAGE_UP:
+    case ui::TextEditCommand::MOVE_PAGE_DOWN_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_PAGE_UP_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::SET_MARK:
+    case ui::TextEditCommand::UNSELECT:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 void Textfield::SetEditCommandForNextKeyEvent(ui::TextEditCommand command) {
   DCHECK(scheduled_edit_command_ == ui::TextEditCommand::INVALID_COMMAND);
   scheduled_edit_command_ = command;
 }
@@ skipping 25 matching lines @@
   return selection_clipboard_text;
 }
 
 void Textfield::ExecuteEditCommand(ui::TextEditCommand command) {
   DestroyTouchSelection();
 
   // Some codepaths may bypass GetCommandForKeyEvent, so any selection-dependent
   // modifications of the command should happen here.
   if (HasSelection()) {
     switch (command) {
       case ui::TextEditCommand::DELETE_WORD_BACKWARD:

[msw, 2016/06/10 01:33:23]

nit: reorder these to something a bit neater.

[karandeepb, 2016/06/15 08:13:34]

Done.

       case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE:
-        command = ui::TextEditCommand::DELETE_BACKWARD;
-        break;
       case ui::TextEditCommand::DELETE_WORD_FORWARD:
       case ui::TextEditCommand::DELETE_TO_END_OF_LINE:
+      case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_PARAGRAPH:
+      case ui::TextEditCommand::DELETE_TO_END_OF_PARAGRAPH:
         command = ui::TextEditCommand::DELETE_FORWARD;
         break;
       default:
         break;
     }
   }
 
   // We only execute the commands enabled in Textfield::IsEditCommandEnabled
   // below. Hence don't do a virtual IsEditCommandEnabled call.
   if (!Textfield::IsEditCommandEnabled(command))
@@ skipping 26 matching lines @@
     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:
+    case ui::TextEditCommand::DELETE_TO_END_OF_PARAGRAPH:
       model_->MoveCursor(gfx::LINE_BREAK, end, true);
       text_changed = cursor_changed = model_->Delete();
       break;
     case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE:
+    case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_PARAGRAPH:
       model_->MoveCursor(gfx::LINE_BREAK, begin, true);
       text_changed = cursor_changed = model_->Backspace();
       break;
     case ui::TextEditCommand::DELETE_WORD_BACKWARD:
       model_->MoveCursor(gfx::WORD_BREAK, begin, true);
       text_changed = cursor_changed = model_->Backspace();
       break;
     case ui::TextEditCommand::DELETE_WORD_FORWARD:
       model_->MoveCursor(gfx::WORD_BREAK, end, true);
       text_changed = cursor_changed = model_->Delete();
@@ skipping 16 matching lines @@
     case ui::TextEditCommand::MOVE_WORD_LEFT_AND_MODIFY_SELECTION:
       model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_LEFT, true);
       break;
     case ui::TextEditCommand::MOVE_WORD_RIGHT:
       model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_RIGHT, false);
       break;
     case ui::TextEditCommand::MOVE_WORD_RIGHT_AND_MODIFY_SELECTION:
       model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_RIGHT, true);
       break;
     case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE:
+    case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_DOCUMENT:
+    case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_PARAGRAPH:
       model_->MoveCursor(gfx::LINE_BREAK, begin, false);
       break;
     case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::
+        MOVE_TO_BEGINNING_OF_DOCUMENT_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::
+        MOVE_TO_BEGINNING_OF_PARAGRAPH_AND_MODIFY_SELECTION:
       model_->MoveCursor(gfx::LINE_BREAK, begin, true);
       break;
     case ui::TextEditCommand::MOVE_TO_END_OF_LINE:
+    case ui::TextEditCommand::MOVE_TO_END_OF_DOCUMENT:
+    case ui::TextEditCommand::MOVE_TO_END_OF_PARAGRAPH:
       model_->MoveCursor(gfx::LINE_BREAK, end, false);
       break;
     case ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_TO_END_OF_DOCUMENT_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_TO_END_OF_PARAGRAPH_AND_MODIFY_SELECTION:
       model_->MoveCursor(gfx::LINE_BREAK, end, true);
       break;
+
+    case ui::TextEditCommand::MOVE_BACKWARD:
+      model_->MoveCursor(gfx::CHARACTER_BREAK, begin, false);
+      break;
+    case ui::TextEditCommand::MOVE_FORWARD:
+      model_->MoveCursor(gfx::CHARACTER_BREAK, end, false);
+      break;
+    case ui::TextEditCommand::MOVE_WORD_BACKWARD:
+      model_->MoveCursor(gfx::WORD_BREAK, begin, false);
+      break;
+    case ui::TextEditCommand::MOVE_WORD_FORWARD:
+      model_->MoveCursor(gfx::WORD_BREAK, end, false);
+      break;
+    case ui::TextEditCommand::MOVE_BACKWARD_AND_MODIFY_SELECTION:

[msw, 2016/06/10 01:33:23]

ditto nit: keep pairing ordering or follow some other pattern consistently.

[karandeepb, 2016/06/15 08:13:34]

Done.

+      model_->MoveCursor(gfx::CHARACTER_BREAK, begin, true);
+      break;
+    case ui::TextEditCommand::MOVE_FORWARD_AND_MODIFY_SELECTION:
+      model_->MoveCursor(gfx::CHARACTER_BREAK, end, true);
+      break;
+    case ui::TextEditCommand::MOVE_WORD_BACKWARD_AND_MODIFY_SELECTION:
+      model_->MoveCursor(gfx::WORD_BREAK, begin, true);
+      break;
+    case ui::TextEditCommand::MOVE_WORD_FORWARD_AND_MODIFY_SELECTION:
+      model_->MoveCursor(gfx::WORD_BREAK, end, true);
+      break;
+
     case ui::TextEditCommand::MOVE_UP:
     case ui::TextEditCommand::MOVE_DOWN:
+    case ui::TextEditCommand::MOVE_UP_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_DOWN_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::INSERT_TEXT:
+    case ui::TextEditCommand::MOVE_PAGE_DOWN:
+    case ui::TextEditCommand::MOVE_PAGE_UP:
+    case ui::TextEditCommand::MOVE_PAGE_DOWN_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_PAGE_UP_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::SET_MARK:
+    case ui::TextEditCommand::UNSELECT:
     case ui::TextEditCommand::INVALID_COMMAND:
       NOTREACHED();
       break;
   }
 
   cursor_changed |= GetSelectionModel() != selection_model;
   if (cursor_changed)
     UpdateSelectionClipboard();
   UpdateAfterChange(text_changed, cursor_changed);
   OnAfterUserAction();
@@ skipping 254 matching lines @@
     RequestFocus();
   model_->MoveCursorTo(mouse);
   if (!selection_clipboard_text.empty()) {
     model_->InsertText(selection_clipboard_text);
     UpdateAfterChange(true, true);
   }
   OnAfterUserAction();
 }
 
 }  // namespace views