| Index: base/base_switches.cc
|
| diff --git a/base/base_switches.cc b/base/base_switches.cc
|
| index 7f3be7f516c58dd961ae699f81bba848651cbbe7..01673c2c4074272b56199e6076288fc8a3bbd471 100644
|
| --- a/base/base_switches.cc
|
| +++ b/base/base_switches.cc
|
| @@ -68,8 +68,14 @@ const char kProfilerTiming[] = "profiler-timing";
|
| const char kProfilerTimingDisabledValue[] = "0";
|
|
|
| #if defined(OS_WIN)
|
| +// Disables merging the key event (WM_KEY*) with the char event (WM_CHAR).
|
| +const char kDisableMergeKeyCharEvents[] = "disable-merge-key-char-events";
|
| +
|
| // Disables the USB keyboard detection for blocking the OSK on Win8+.
|
| const char kDisableUsbKeyboardDetect[] = "disable-usb-keyboard-detect";
|
| +
|
| +// Enables merging the key event (WM_KEY*) with the char event (WM_CHAR).
|
| +const char kEnableMergeKeyCharEvents[] = "enable-merge-key-char-events";
|
| #endif
|
|
|
| #if defined(OS_POSIX)
|
|
|