| Index: ui/views/cocoa/bridged_content_view.mm
|
| diff --git a/ui/views/cocoa/bridged_content_view.mm b/ui/views/cocoa/bridged_content_view.mm
|
| index 80243f8a5f7535b5575269562de5e452fc64613f..7cb9c0485819bed1b6fa7e1fc2ae517acf7d8359 100644
|
| --- a/ui/views/cocoa/bridged_content_view.mm
|
| +++ b/ui/views/cocoa/bridged_content_view.mm
|
| @@ -791,14 +791,14 @@ - (void)moveLeft:(id)sender {
|
| }
|
|
|
| - (void)moveUp:(id)sender {
|
| - [self handleAction:ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE
|
| + [self handleAction:ui::TextEditCommand::MOVE_UP
|
| keyCode:ui::VKEY_UP
|
| domCode:ui::DomCode::ARROW_UP
|
| eventFlags:0];
|
| }
|
|
|
| - (void)moveDown:(id)sender {
|
| - [self handleAction:ui::TextEditCommand::MOVE_TO_END_OF_LINE
|
| + [self handleAction:ui::TextEditCommand::MOVE_DOWN
|
| keyCode:ui::VKEY_DOWN
|
| domCode:ui::DomCode::ARROW_DOWN
|
| eventFlags:0];
|
| @@ -861,17 +861,20 @@ - (void)moveToBeginningOfDocument:(id)sender {
|
| }
|
|
|
| - (void)pageDown:(id)sender {
|
| - [self handleAction:ui::TextEditCommand::MOVE_TO_END_OF_LINE
|
| + // The pageDown: action message is bound to the key combination
|
| + // [Option+PageDown].
|
| + [self handleAction:ui::TextEditCommand::MOVE_PAGE_DOWN
|
| keyCode:ui::VKEY_NEXT
|
| domCode:ui::DomCode::PAGE_DOWN
|
| - eventFlags:0];
|
| + eventFlags:ui::EF_ALT_DOWN];
|
| }
|
|
|
| - (void)pageUp:(id)sender {
|
| - [self handleAction:ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE
|
| + // The pageUp: action message is bound to the key combination [Option+PageUp].
|
| + [self handleAction:ui::TextEditCommand::MOVE_PAGE_UP
|
| keyCode:ui::VKEY_PRIOR
|
| domCode:ui::DomCode::PAGE_UP
|
| - eventFlags:0];
|
| + eventFlags:ui::EF_ALT_DOWN];
|
| }
|
|
|
| - (void)moveBackwardAndModifySelection:(id)sender {
|
| @@ -904,19 +907,17 @@ - (void)moveWordBackwardAndModifySelection:(id)sender {
|
| }
|
|
|
| - (void)moveUpAndModifySelection:(id)sender {
|
| - [self handleAction:ui::TextEditCommand::
|
| - MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
|
| + [self handleAction:ui::TextEditCommand::MOVE_UP_AND_MODIFY_SELECTION
|
| keyCode:ui::VKEY_UP
|
| domCode:ui::DomCode::ARROW_UP
|
| eventFlags:ui::EF_SHIFT_DOWN];
|
| }
|
|
|
| - (void)moveDownAndModifySelection:(id)sender {
|
| - [self
|
| - handleAction:ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION
|
| - keyCode:ui::VKEY_DOWN
|
| - domCode:ui::DomCode::ARROW_DOWN
|
| - eventFlags:ui::EF_SHIFT_DOWN];
|
| + [self handleAction:ui::TextEditCommand::MOVE_DOWN_AND_MODIFY_SELECTION
|
| + keyCode:ui::VKEY_DOWN
|
| + domCode:ui::DomCode::ARROW_DOWN
|
| + eventFlags:ui::EF_SHIFT_DOWN];
|
| }
|
|
|
| - (void)moveToBeginningOfLineAndModifySelection:(id)sender {
|
| @@ -968,32 +969,30 @@ - (void)moveToBeginningOfDocumentAndModifySelection:(id)sender {
|
| }
|
|
|
| - (void)pageDownAndModifySelection:(id)sender {
|
| - [self
|
| - handleAction:ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION
|
| - keyCode:ui::VKEY_NEXT
|
| - domCode:ui::DomCode::PAGE_DOWN
|
| - eventFlags:ui::EF_SHIFT_DOWN];
|
| + [self handleAction:ui::TextEditCommand::MOVE_PAGE_DOWN_AND_MODIFY_SELECTION
|
| + keyCode:ui::VKEY_NEXT
|
| + domCode:ui::DomCode::PAGE_DOWN
|
| + eventFlags:ui::EF_SHIFT_DOWN];
|
| }
|
|
|
| - (void)pageUpAndModifySelection:(id)sender {
|
| - [self handleAction:ui::TextEditCommand::
|
| - MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
|
| + [self handleAction:ui::TextEditCommand::MOVE_PAGE_UP_AND_MODIFY_SELECTION
|
| keyCode:ui::VKEY_PRIOR
|
| domCode:ui::DomCode::PAGE_UP
|
| eventFlags:ui::EF_SHIFT_DOWN];
|
| }
|
|
|
| - (void)moveParagraphForwardAndModifySelection:(id)sender {
|
| - [self
|
| - handleAction:ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION
|
| - keyCode:ui::VKEY_DOWN
|
| - domCode:ui::DomCode::ARROW_DOWN
|
| - eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
|
| + [self handleAction:ui::TextEditCommand::
|
| + MOVE_PARAGRAPH_FORWARD_AND_MODIFY_SELECTION
|
| + keyCode:ui::VKEY_DOWN
|
| + domCode:ui::DomCode::ARROW_DOWN
|
| + eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
|
| }
|
|
|
| - (void)moveParagraphBackwardAndModifySelection:(id)sender {
|
| [self handleAction:ui::TextEditCommand::
|
| - MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
|
| + MOVE_PARAGRAPH_BACKWARD_AND_MODIFY_SELECTION
|
| keyCode:ui::VKEY_UP
|
| domCode:ui::DomCode::ARROW_UP
|
| eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
|
|
|