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 151 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 the ui::TextEditCommand corresponding to the |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);
-      if (IsTextEditCommandEnabled(command)) {
-        ExecuteTextEditCommand(command);
+      if (IsTextEditCommandEnabled(commands[i].command())) {
+        ExecuteTextEditCommand(commands[i].command());
         handled = true;
       }
     }
     return handled;
   }
 #endif
 
   if (edit_command == ui::TextEditCommand::INVALID_COMMAND)
     edit_command = GetCommandForKeyEvent(event);
 
@@ skipping 114 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 (IsTextEditCommandEnabled(GetViewsCommand(commands[i], rtl)))
+      if (IsTextEditCommandEnabled(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 613 matching lines @@
     DeleteRange(range);
 }
 
 void Textfield::EnsureCaretInRect(const gfx::Rect& rect) {}
 
 bool Textfield::IsTextEditCommandEnabled(ui::TextEditCommand command) const {
   base::string16 result;
   bool editable = !read_only();
   bool readable = text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD;
   switch (command) {
-    case ui::TextEditCommand::INVALID_COMMAND:
-      return false;
+    case ui::TextEditCommand::DELETE_BACKWARD:
+    case ui::TextEditCommand::DELETE_FORWARD:
+    case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE:
+    case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_PARAGRAPH:
+    case ui::TextEditCommand::DELETE_TO_END_OF_LINE:
+    case ui::TextEditCommand::DELETE_TO_END_OF_PARAGRAPH:
+    case ui::TextEditCommand::DELETE_WORD_BACKWARD:
+    case ui::TextEditCommand::DELETE_WORD_FORWARD:
+      return editable;
+    case ui::TextEditCommand::MOVE_BACKWARD:
+    case ui::TextEditCommand::MOVE_BACKWARD_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_FORWARD:
+    case ui::TextEditCommand::MOVE_FORWARD_AND_MODIFY_SELECTION:
+    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_TO_BEGINNING_OF_DOCUMENT:
+    case ui::TextEditCommand::
+        MOVE_TO_BEGINNING_OF_DOCUMENT_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_BEGINNING_OF_PARAGRAPH:
+    case ui::TextEditCommand::
+        MOVE_TO_BEGINNING_OF_PARAGRAPH_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_TO_END_OF_DOCUMENT:
+    case ui::TextEditCommand::MOVE_TO_END_OF_DOCUMENT_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_TO_END_OF_PARAGRAPH:
+    case ui::TextEditCommand::MOVE_TO_END_OF_PARAGRAPH_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_WORD_BACKWARD:
+    case ui::TextEditCommand::MOVE_WORD_BACKWARD_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_WORD_FORWARD:
+    case ui::TextEditCommand::MOVE_WORD_FORWARD_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:
+      return true;
     case ui::TextEditCommand::UNDO:
       return editable && model_->CanUndo();
     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::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:
-    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:
-      return true;
+    case ui::TextEditCommand::MOVE_DOWN:
+    case ui::TextEditCommand::MOVE_DOWN_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_PAGE_DOWN:
+    case ui::TextEditCommand::MOVE_PAGE_DOWN_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_PAGE_UP:
+    case ui::TextEditCommand::MOVE_PAGE_UP_AND_MODIFY_SELECTION:
     case ui::TextEditCommand::MOVE_UP:
-    case ui::TextEditCommand::MOVE_DOWN:
+    case ui::TextEditCommand::MOVE_UP_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::INSERT_TEXT:
+    case ui::TextEditCommand::SET_MARK:
+    case ui::TextEditCommand::UNSELECT:
+    case ui::TextEditCommand::INVALID_COMMAND:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 void Textfield::SetTextEditCommandForNextKeyEvent(ui::TextEditCommand command) {
   DCHECK_EQ(ui::TextEditCommand::INVALID_COMMAND, scheduled_text_edit_command_);
   scheduled_text_edit_command_ = command;
 }
@@ skipping 25 matching lines @@
   return selection_clipboard_text;
 }
 
 void Textfield::ExecuteTextEditCommand(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_TO_BEGINNING_OF_LINE:
+      case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_PARAGRAPH:
+      case ui::TextEditCommand::DELETE_TO_END_OF_LINE:
+      case ui::TextEditCommand::DELETE_TO_END_OF_PARAGRAPH:
       case ui::TextEditCommand::DELETE_WORD_BACKWARD:
-      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:
         command = ui::TextEditCommand::DELETE_FORWARD;
         break;
       default:
         break;
     }
   }
 
   // We only execute the commands enabled in Textfield::IsTextEditCommandEnabled
   // below. Hence don't do a virtual IsTextEditCommandEnabled call.
   if (!Textfield::IsTextEditCommandEnabled(command))
     return;
 
   bool text_changed = false;
   bool cursor_changed = false;
   bool rtl = GetTextDirection() == base::i18n::RIGHT_TO_LEFT;
   gfx::VisualCursorDirection begin = rtl ? gfx::CURSOR_RIGHT : gfx::CURSOR_LEFT;
   gfx::VisualCursorDirection end = rtl ? gfx::CURSOR_LEFT : gfx::CURSOR_RIGHT;
   gfx::SelectionModel selection_model = GetSelectionModel();
 
   OnBeforeUserAction();
   switch (command) {
-    case ui::TextEditCommand::UNDO:
-      text_changed = cursor_changed = model_->Undo();
-      break;
-    case ui::TextEditCommand::REDO:
-      text_changed = cursor_changed = model_->Redo();
-      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::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_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_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:
-      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();
       break;
+    case ui::TextEditCommand::MOVE_BACKWARD:
+      model_->MoveCursor(gfx::CHARACTER_BREAK, begin, false);
+      break;
+    case ui::TextEditCommand::MOVE_BACKWARD_AND_MODIFY_SELECTION:
+      model_->MoveCursor(gfx::CHARACTER_BREAK, begin, true);
+      break;
+    case ui::TextEditCommand::MOVE_FORWARD:
+      model_->MoveCursor(gfx::CHARACTER_BREAK, end, false);
+      break;
+    case ui::TextEditCommand::MOVE_FORWARD_AND_MODIFY_SELECTION:
+      model_->MoveCursor(gfx::CHARACTER_BREAK, end, true);
+      break;
     case ui::TextEditCommand::MOVE_LEFT:
       model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_LEFT, false);
       break;
     case ui::TextEditCommand::MOVE_LEFT_AND_MODIFY_SELECTION:
       model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_LEFT, true);
       break;
     case ui::TextEditCommand::MOVE_RIGHT:
       model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_RIGHT, false);
       break;
     case ui::TextEditCommand::MOVE_RIGHT_AND_MODIFY_SELECTION:
       model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_RIGHT, true);
       break;
+    case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_DOCUMENT:
+    case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE:
+    case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_PARAGRAPH:
+      model_->MoveCursor(gfx::LINE_BREAK, begin, false);
+      break;
+    case ui::TextEditCommand::
+        MOVE_TO_BEGINNING_OF_DOCUMENT_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE_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_DOCUMENT:
+    case ui::TextEditCommand::MOVE_TO_END_OF_LINE:
+    case ui::TextEditCommand::MOVE_TO_END_OF_PARAGRAPH:
+      model_->MoveCursor(gfx::LINE_BREAK, end, false);
+      break;
+    case ui::TextEditCommand::MOVE_TO_END_OF_DOCUMENT_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_TO_END_OF_LINE_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_WORD_BACKWARD:
+      model_->MoveCursor(gfx::WORD_BREAK, begin, false);
+      break;
+    case ui::TextEditCommand::MOVE_WORD_BACKWARD_AND_MODIFY_SELECTION:
+      model_->MoveCursor(gfx::WORD_BREAK, begin, true);
+      break;
+    case ui::TextEditCommand::MOVE_WORD_FORWARD:
+      model_->MoveCursor(gfx::WORD_BREAK, end, false);
+      break;
+    case ui::TextEditCommand::MOVE_WORD_FORWARD_AND_MODIFY_SELECTION:
+      model_->MoveCursor(gfx::WORD_BREAK, end, true);
+      break;
     case ui::TextEditCommand::MOVE_WORD_LEFT:
       model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_LEFT, false);
       break;
     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:
-      model_->MoveCursor(gfx::LINE_BREAK, begin, false);
+    case ui::TextEditCommand::UNDO:
+      text_changed = cursor_changed = model_->Undo();
       break;
-    case ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION:
-      model_->MoveCursor(gfx::LINE_BREAK, begin, true);
+    case ui::TextEditCommand::REDO:
+      text_changed = cursor_changed = model_->Redo();
       break;
-    case ui::TextEditCommand::MOVE_TO_END_OF_LINE:
-      model_->MoveCursor(gfx::LINE_BREAK, end, false);
+    case ui::TextEditCommand::CUT:
+      text_changed = cursor_changed = Cut();
       break;
-    case ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION:
-      model_->MoveCursor(gfx::LINE_BREAK, end, true);
+    case ui::TextEditCommand::COPY:
+      Copy();
       break;
+    case ui::TextEditCommand::PASTE:
+      text_changed = cursor_changed = Paste();
+      break;
+    case ui::TextEditCommand::SELECT_ALL:
+      SelectAll(false);
+      break;
+    case ui::TextEditCommand::MOVE_DOWN:
+    case ui::TextEditCommand::MOVE_DOWN_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_PAGE_DOWN:
+    case ui::TextEditCommand::MOVE_PAGE_DOWN_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::MOVE_PAGE_UP:
+    case ui::TextEditCommand::MOVE_PAGE_UP_AND_MODIFY_SELECTION:
     case ui::TextEditCommand::MOVE_UP:
-    case ui::TextEditCommand::MOVE_DOWN:
+    case ui::TextEditCommand::MOVE_UP_AND_MODIFY_SELECTION:
+    case ui::TextEditCommand::INSERT_TEXT:
+    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