third_party/WebKit/Source/core/editing/commands/EditorCommandNames.h - Issue 2611823003: ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/editing/commands/EditorCommandNames.h

Issue 2611823003: ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions). (Closed)

Patch Set: Inducing merge conflicts to force human review and changes after rename. Created 3 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp ('k') | third_party/WebKit/Source/core/fetch/Resource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/commands/EditorCommandNames.h

diff --git a/third_party/WebKit/Source/core/editing/commands/EditorCommandNames.h b/third_party/WebKit/Source/core/editing/commands/EditorCommandNames.h

index 40a6714c744cfa55bfc967f7952667e7953c6d1e..10397771ef70d27a56712f648aecd4aa6c03611f 100644

--- a/third_party/WebKit/Source/core/editing/commands/EditorCommandNames.h

+++ b/third_party/WebKit/Source/core/editing/commands/EditorCommandNames.h

@@ -9,6 +9,8 @@ namespace blink {

// Must be ordered in a case-folding manner for binary search. Covered by unit

// tests in EditingCommandTest.cpp (not able to use static_assert)

+ /* DO NOT SUBMIT - conflict resolution helper:

+ * Important to have AlignCenter instead of kAlignCenter below. */

#define FOR_EACH_BLINK_EDITING_COMMAND_NAME(V) \

V(AlignCenter) \

V(AlignJustified) \

@@ -149,6 +151,8 @@ namespace blink {

V(UseCSS) \

V(Yank) \

V(YankAndSelect)

+ /* DO NOT SUBMIT - conflict resolution helper:

+ * Important to have YankAndSelect instead of kYankAndSelect above. */

} // namespace blink