| Index: ui/base/ui_base_switches.h
|
| diff --git a/ui/base/ui_base_switches.h b/ui/base/ui_base_switches.h
|
| index 5b55fa7747efac36a4c7984bb7370525229fe6f1..0c02dbc0d94b2e17eeedae8f1ff82985ce91e882 100644
|
| --- a/ui/base/ui_base_switches.h
|
| +++ b/ui/base/ui_base_switches.h
|
| @@ -18,6 +18,11 @@ UI_BASE_EXPORT extern const char kDisableRemoteCoreAnimation[];
|
| UI_BASE_EXPORT extern const char kShowMacOverlayBorders[];
|
| #endif
|
|
|
| +#if defined(OS_WIN)
|
| +UI_BASE_EXPORT extern const char kDisableMergeKeyCharEvents[];
|
| +UI_BASE_EXPORT extern const char kEnableMergeKeyCharEvents[];
|
| +#endif
|
| +
|
| UI_BASE_EXPORT extern const char kDisableDwmComposition[];
|
| UI_BASE_EXPORT extern const char kDisableIconNtp[];
|
| UI_BASE_EXPORT extern const char kDisableTouchAdjustment[];
|
|
|