MacViews: Correct behavior of move and select commands when selection direction changes.

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 1247 matching lines @@
     case IDS_MOVE_LEFT:
     case IDS_MOVE_LEFT_AND_MODIFY_SELECTION:
     case IDS_MOVE_RIGHT:
     case IDS_MOVE_RIGHT_AND_MODIFY_SELECTION:
     case IDS_MOVE_WORD_LEFT:
     case IDS_MOVE_WORD_LEFT_AND_MODIFY_SELECTION:
     case IDS_MOVE_WORD_RIGHT:
     case IDS_MOVE_WORD_RIGHT_AND_MODIFY_SELECTION:
     case IDS_MOVE_TO_BEGINNING_OF_LINE:
     case IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION:
+    case IDS_MOVE_TO_BEGINNING_OF_LINE_AND_EXTEND_SELECTION:
+    case IDS_MOVE_TOWARDS_BEGINNING_OF_LINE_AND_MODIFY_SELECTION:
     case IDS_MOVE_TO_END_OF_LINE:
     case IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION:
+    case IDS_MOVE_TO_END_OF_LINE_AND_EXTEND_SELECTION:
+    case IDS_MOVE_TOWARDS_END_OF_LINE_AND_MODIFY_SELECTION:
       return true;
     default:
       return false;
   }
 }
 
 bool Textfield::GetAcceleratorForCommandId(int command_id,
                                            ui::Accelerator* accelerator) {
   switch (command_id) {
     case IDS_APP_UNDO:
@@ skipping 42 matching lines @@
   if (!IsCommandIdEnabled(command_id))
     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();
 
+#if defined(OS_MACOSX)
+  gfx::SelectionReversedBehavior word_selection = gfx::SELECTION_CARET;
+#else
+  gfx::SelectionReversedBehavior word_selection = gfx::SELECTION_START_NEW;
+#endif
+
   OnBeforeUserAction();
   switch (command_id) {
     case IDS_APP_UNDO:
       text_changed = cursor_changed = model_->Undo();
       break;
     case IDS_APP_REDO:
       text_changed = cursor_changed = model_->Redo();
       break;
     case IDS_APP_CUT:
       text_changed = cursor_changed = Cut();
@@ skipping 41 matching lines @@
     case IDS_MOVE_RIGHT:
       model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_RIGHT, false);
       break;
     case IDS_MOVE_RIGHT_AND_MODIFY_SELECTION:
       model_->MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_RIGHT, true);
       break;
     case IDS_MOVE_WORD_LEFT:
       model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_LEFT, false);
       break;
     case IDS_MOVE_WORD_LEFT_AND_MODIFY_SELECTION:
-      model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_LEFT, true);
+      model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_LEFT, true,
+                         word_selection);
       break;
     case IDS_MOVE_WORD_RIGHT:
       model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_RIGHT, false);
       break;
     case IDS_MOVE_WORD_RIGHT_AND_MODIFY_SELECTION:
-      model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_RIGHT, true);
+      model_->MoveCursor(gfx::WORD_BREAK, gfx::CURSOR_RIGHT, true,
+                         word_selection);
       break;
     case IDS_MOVE_TO_BEGINNING_OF_LINE:
       model_->MoveCursor(gfx::LINE_BREAK, begin, false);
       break;
     case IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION:
-      model_->MoveCursor(gfx::LINE_BREAK, begin, true);
+      model_->MoveCursor(gfx::LINE_BREAK, begin, true,
+                         gfx::SELECTION_START_NEW);
+      break;
+    case IDS_MOVE_TO_BEGINNING_OF_LINE_AND_EXTEND_SELECTION:
+      model_->MoveCursor(gfx::LINE_BREAK, begin, true, gfx::SELECTION_EXTEND);
+      break;
+    case IDS_MOVE_TOWARDS_BEGINNING_OF_LINE_AND_MODIFY_SELECTION:
+      model_->MoveCursor(gfx::LINE_BREAK, begin, true, gfx::SELECTION_CARET);
       break;
     case IDS_MOVE_TO_END_OF_LINE:
       model_->MoveCursor(gfx::LINE_BREAK, end, false);
       break;
     case IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION:
-      model_->MoveCursor(gfx::LINE_BREAK, end, true);
+      model_->MoveCursor(gfx::LINE_BREAK, end, true, gfx::SELECTION_START_NEW);
+      break;
+    case IDS_MOVE_TO_END_OF_LINE_AND_EXTEND_SELECTION:
+      model_->MoveCursor(gfx::LINE_BREAK, end, true, gfx::SELECTION_EXTEND);
+      break;
+    case IDS_MOVE_TOWARDS_END_OF_LINE_AND_MODIFY_SELECTION:
+      model_->MoveCursor(gfx::LINE_BREAK, end, true, gfx::SELECTION_CARET);
       break;
     default:
       NOTREACHED();
       break;
   }
 
   cursor_changed |= GetSelectionModel() != selection_model;
   if (cursor_changed)
     UpdateSelectionClipboard();
   UpdateAfterChange(text_changed, cursor_changed);
@@ skipping 507 matching lines @@
     RequestFocus();
   model_->MoveCursorTo(mouse);
   if (!selection_clipboard_text.empty()) {
     model_->InsertText(selection_clipboard_text);
     UpdateAfterChange(true, true);
   }
   OnAfterUserAction();
 }
 
 }  // namespace views