Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ui/events/linux/text_edit_command_auralinux.cc

Issue 2034623002: Unify ui::TextEditCommand and ui::TextEditCommandAuraLinux::CommandId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@refactor7_correct_text_edit_command_aura_typo
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« ui/events/linux/text_edit_command_auralinux.h ('K') | « ui/events/linux/text_edit_command_auralinux.h ('k') | ui/events/text_edit_commands.h » ('j') | ui/events/text_edit_commands.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/events/linux/text_edit_command_auralinux.h" 5 #include "ui/events/linux/text_edit_command_auralinux.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/events/text_edit_commands.h"
8 9
9 namespace ui { 10 namespace ui {
10 11
12 // This is sent to the renderer. Keep the string representation in sync with
13 // third_party/WebKit/public/platform/WebEditingCommandType.h.
11 std::string TextEditCommandAuraLinux::GetCommandString() const { 14 std::string TextEditCommandAuraLinux::GetCommandString() const {
12 std::string base_name; 15 switch (command_) {
13 switch (command_id_) { 16 case TextEditCommand::COPY:
msw 2016/06/10 01:33:23 nit: can you follow up with one more CL to reorder
karandeepb 2016/06/15 08:13:34 Done.
14 case COPY: 17 return "Copy";
15 base_name = "Copy"; 18 case TextEditCommand::CUT:
16 break; 19 return "Cut";
17 case CUT: 20 case TextEditCommand::DELETE_BACKWARD:
18 base_name = "Cut"; 21 return "DeleteBackward";
19 break; 22 case TextEditCommand::DELETE_FORWARD:
20 case DELETE_BACKWARD: 23 return "DeleteForward";
21 base_name = "DeleteBackward"; 24 case TextEditCommand::DELETE_TO_BEGINNING_OF_LINE:
22 break; 25 return "DeleteToBeginningOfLine";
23 case DELETE_FORWARD: 26 case TextEditCommand::DELETE_TO_BEGINNING_OF_PARAGRAPH:
24 base_name = "DeleteForward"; 27 return "DeleteToBeginningOfParagraph";
25 break; 28 case TextEditCommand::DELETE_TO_END_OF_LINE:
26 case DELETE_TO_BEGINNING_OF_LINE: 29 return "DeleteToEndOfLine";
27 base_name = "DeleteToBeginningOfLine"; 30 case TextEditCommand::DELETE_TO_END_OF_PARAGRAPH:
28 break; 31 return "DeleteToEndOfParagraph";
29 case DELETE_TO_BEGINNING_OF_PARAGRAPH: 32 case TextEditCommand::DELETE_WORD_BACKWARD:
30 base_name = "DeleteToBeginningOfParagraph"; 33 return "DeleteWordBackward";
31 break; 34 case TextEditCommand::DELETE_WORD_FORWARD:
32 case DELETE_TO_END_OF_LINE: 35 return "DeleteWordForward";
33 base_name = "DeleteToEndOfLine"; 36 case TextEditCommand::INSERT_TEXT:
34 break; 37 return "InsertText";
35 case DELETE_TO_END_OF_PARAGRAPH: 38 case TextEditCommand::MOVE_BACKWARD:
36 base_name = "DeleteToEndOfParagraph"; 39 return "MoveBackward";
37 break; 40 case TextEditCommand::MOVE_DOWN:
38 case DELETE_WORD_BACKWARD: 41 return "MoveDown";
39 base_name = "DeleteWordBackward"; 42 case TextEditCommand::MOVE_FORWARD:
40 break; 43 return "MoveForward";
41 case DELETE_WORD_FORWARD: 44 case TextEditCommand::MOVE_LEFT:
42 base_name = "DeleteWordForward"; 45 return "MoveLeft";
43 break; 46 case TextEditCommand::MOVE_PAGE_DOWN:
44 case INSERT_TEXT: 47 return "MovePageDown";
45 base_name = "InsertText"; 48 case TextEditCommand::MOVE_PAGE_UP:
46 break; 49 return "MovePageUp";
47 case MOVE_BACKWARD: 50 case TextEditCommand::MOVE_RIGHT:
48 base_name = "MoveBackward"; 51 return "MoveRight";
49 break; 52 case TextEditCommand::MOVE_TO_BEGINNING_OF_DOCUMENT:
50 case MOVE_DOWN: 53 return "MoveToBeginningOfDocument";
51 base_name = "MoveDown"; 54 case TextEditCommand::MOVE_TO_BEGINNING_OF_LINE:
52 break; 55 return "MoveToBeginningOfLine";
53 case MOVE_FORWARD: 56 case TextEditCommand::MOVE_TO_BEGINNING_OF_PARAGRAPH:
54 base_name = "MoveForward"; 57 return "MoveToBeginningOfParagraph";
55 break; 58 case TextEditCommand::MOVE_TO_END_OF_DOCUMENT:
56 case MOVE_LEFT: 59 return "MoveToEndOfDocument";
57 base_name = "MoveLeft"; 60 case TextEditCommand::MOVE_TO_END_OF_LINE:
58 break; 61 return "MoveToEndOfLine";
59 case MOVE_PAGE_DOWN: 62 case TextEditCommand::MOVE_TO_END_OF_PARAGRAPH:
60 base_name = "MovePageDown"; 63 return "MoveToEndOfParagraph";
61 break; 64 case TextEditCommand::MOVE_UP:
62 case MOVE_PAGE_UP: 65 return "MoveUp";
63 base_name = "MovePageUp"; 66 case TextEditCommand::MOVE_WORD_BACKWARD:
64 break; 67 return "MoveWordBackward";
65 case MOVE_RIGHT: 68 case TextEditCommand::MOVE_WORD_FORWARD:
66 base_name = "MoveRight"; 69 return "MoveWordForward";
67 break; 70 case TextEditCommand::MOVE_WORD_LEFT:
68 case MOVE_TO_BEGINNING_OF_DOCUMENT: 71 return "MoveWordLeft";
69 base_name = "MoveToBeginningOfDocument"; 72 case TextEditCommand::MOVE_WORD_RIGHT:
70 break; 73 return "MoveWordRight";
71 case MOVE_TO_BEGINNING_OF_LINE: 74 case TextEditCommand::PASTE:
72 base_name = "MoveToBeginningOfLine"; 75 return "Paste";
73 break; 76 case TextEditCommand::SELECT_ALL:
74 case MOVE_TO_BEGINNING_OF_PARAGRAPH: 77 return "SelectAll";
75 base_name = "MoveToBeginningOfParagraph"; 78 case TextEditCommand::SET_MARK:
76 break; 79 return "SetMark";
77 case MOVE_TO_END_OF_DOCUMENT: 80 case TextEditCommand::UNSELECT:
78 base_name = "MoveToEndOfDocument"; 81 return "Unselect";
79 break; 82 case TextEditCommand::INVALID_COMMAND:
80 case MOVE_TO_END_OF_LINE: 83 // Maybe return "Invalid" like in renderer.
msw 2016/06/10 01:33:23 nit: remove/address this contemplative comment.
karandeepb 2016/06/15 08:13:34 Done.
81 base_name = "MoveToEndOfLine";
82 break;
83 case MOVE_TO_END_OF_PARAGRAPH:
84 base_name = "MoveToEndOfParagraph";
85 break;
86 case MOVE_UP:
87 base_name = "MoveUp";
88 break;
89 case MOVE_WORD_BACKWARD:
90 base_name = "MoveWordBackward";
91 break;
92 case MOVE_WORD_FORWARD:
93 base_name = "MoveWordForward";
94 break;
95 case MOVE_WORD_LEFT:
96 base_name = "MoveWordLeft";
97 break;
98 case MOVE_WORD_RIGHT:
99 base_name = "MoveWordRight";
100 break;
101 case PASTE:
102 base_name = "Paste";
103 break;
104 case SELECT_ALL:
105 base_name = "SelectAll";
106 break;
107 case SET_MARK:
108 base_name = "SetMark";
109 break;
110 case UNSELECT:
111 base_name = "Unselect";
112 break;
113 case INVALID_COMMAND:
114 NOTREACHED(); 84 NOTREACHED();
115 return std::string(); 85 return std::string();
86
87 case TextEditCommand::UNDO:
88 return "Undo";
89 case TextEditCommand::REDO:
90 return "Redo";
91 case TextEditCommand::MOVE_LEFT_AND_MODIFY_SELECTION:
92 return "MoveLeftAndModifySelection";
93 case TextEditCommand::MOVE_RIGHT_AND_MODIFY_SELECTION:
94 return "MoveRightAndModifySelection";
95 case TextEditCommand::MOVE_WORD_LEFT_AND_MODIFY_SELECTION:
96 return "MoveWordLeftAndModifySelection";
97 case TextEditCommand::MOVE_WORD_RIGHT_AND_MODIFY_SELECTION:
98 return "MoveWordRightAndModifySelection";
99 case TextEditCommand::MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION:
100 return "MoveToBeginningOfLineAndModifySelection";
101 case TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION:
102 return "MoveToEndOfLineAndModifySelection";
103 case TextEditCommand::MOVE_UP_AND_MODIFY_SELECTION:
104 return "MoveUpAndModifySelection";
105 case TextEditCommand::MOVE_DOWN_AND_MODIFY_SELECTION:
106 return "MoveDownAndModifySelection";
107 case TextEditCommand::MOVE_BACKWARD_AND_MODIFY_SELECTION:
108 return "MoveBackwardAndModifySelection";
109 case TextEditCommand::MOVE_FORWARD_AND_MODIFY_SELECTION:
110 return "MoveForwardAndModifySelection";
111 case TextEditCommand::MOVE_PAGE_DOWN_AND_MODIFY_SELECTION:
112 return "MovePageDownAndModifySelection";
113 case TextEditCommand::MOVE_PAGE_UP_AND_MODIFY_SELECTION:
114 return "MovePageUpAndModifySelection";
115 case TextEditCommand::MOVE_TO_BEGINNING_OF_DOCUMENT_AND_MODIFY_SELECTION:
116 return "MoveToBeginingOfDocumentAndModifySelection";
117 case TextEditCommand::MOVE_TO_BEGINNING_OF_PARAGRAPH_AND_MODIFY_SELECTION:
118 return "MoveToBeginingOfParagraphAndModifySelection";
119 case TextEditCommand::MOVE_TO_END_OF_DOCUMENT_AND_MODIFY_SELECTION:
120 return "MoveToEndOfDocumentAndModifySelection";
121 case TextEditCommand::MOVE_TO_END_OF_PARAGRAPH_AND_MODIFY_SELECTION:
122 return "MoveToEndOfParagraphAndModifySelection";
123 case TextEditCommand::MOVE_WORD_BACKWARD_AND_MODIFY_SELECTION:
124 return "MoveWordBackwardAndModifySelection";
125 case TextEditCommand::MOVE_WORD_FORWARD_AND_MODIFY_SELECTION:
126 return "MoveWordForwardAndModifySelection";
116 } 127 }
117 128 NOTREACHED();
118 if (extend_selection()) 129 return std::string();
119 base_name += "AndModifySelection";
120
121 return base_name;
122 } 130 }
123 131
124 } // namespace ui 132 } // namespace ui
OLDNEW
« ui/events/linux/text_edit_command_auralinux.h ('K') | « ui/events/linux/text_edit_command_auralinux.h ('k') | ui/events/text_edit_commands.h » ('j') | ui/events/text_edit_commands.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698