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

Unified Diff: ui/views/cocoa/bridged_content_view.mm

Issue 1560293002: Rename KEY_ constants to avoid conflict with <linux/input.h> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments (Wez) Created 4 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 | « ui/ozone/demo/ozone_demo.cc ('k') | ui/views/controls/combobox/combobox_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2167561368c38f1b8a637d99c1b1daa022faae15..4c77c0b269511f9151dd5b100f754b7a973c5096 100644
--- a/ui/views/cocoa/bridged_content_view.mm
+++ b/ui/views/cocoa/bridged_content_view.mm
@@ -208,7 +208,7 @@ bool DispatchEventToMenu(views::Widget* widget, ui::KeyboardCode key_code) {
DCHECK(textInputClient_->IsEditCommandEnabled(IDS_APP_UNDO));
[self handleAction:IDS_APP_UNDO
keyCode:ui::VKEY_Z
- domCode:ui::DomCode::KEY_Z
+ domCode:ui::DomCode::US_Z
eventFlags:ui::EF_CONTROL_DOWN];
}
@@ -216,7 +216,7 @@ bool DispatchEventToMenu(views::Widget* widget, ui::KeyboardCode key_code) {
DCHECK(textInputClient_->IsEditCommandEnabled(IDS_APP_REDO));
[self handleAction:IDS_APP_REDO
keyCode:ui::VKEY_Z
- domCode:ui::DomCode::KEY_Z
+ domCode:ui::DomCode::US_Z
eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
}
@@ -224,7 +224,7 @@ bool DispatchEventToMenu(views::Widget* widget, ui::KeyboardCode key_code) {
DCHECK(textInputClient_->IsEditCommandEnabled(IDS_APP_CUT));
[self handleAction:IDS_APP_CUT
keyCode:ui::VKEY_X
- domCode:ui::DomCode::KEY_X
+ domCode:ui::DomCode::US_X
eventFlags:ui::EF_CONTROL_DOWN];
}
@@ -232,7 +232,7 @@ bool DispatchEventToMenu(views::Widget* widget, ui::KeyboardCode key_code) {
DCHECK(textInputClient_->IsEditCommandEnabled(IDS_APP_COPY));
[self handleAction:IDS_APP_COPY
keyCode:ui::VKEY_C
- domCode:ui::DomCode::KEY_C
+ domCode:ui::DomCode::US_C
eventFlags:ui::EF_CONTROL_DOWN];
}
@@ -240,7 +240,7 @@ bool DispatchEventToMenu(views::Widget* widget, ui::KeyboardCode key_code) {
DCHECK(textInputClient_->IsEditCommandEnabled(IDS_APP_PASTE));
[self handleAction:IDS_APP_PASTE
keyCode:ui::VKEY_V
- domCode:ui::DomCode::KEY_V
+ domCode:ui::DomCode::US_V
eventFlags:ui::EF_CONTROL_DOWN];
}
@@ -248,7 +248,7 @@ bool DispatchEventToMenu(views::Widget* widget, ui::KeyboardCode key_code) {
DCHECK(textInputClient_->IsEditCommandEnabled(IDS_APP_SELECT_ALL));
[self handleAction:IDS_APP_SELECT_ALL
keyCode:ui::VKEY_A
- domCode:ui::DomCode::KEY_A
+ domCode:ui::DomCode::US_A
eventFlags:ui::EF_CONTROL_DOWN];
}
« no previous file with comments | « ui/ozone/demo/ozone_demo.cc ('k') | ui/views/controls/combobox/combobox_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698