| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index a2055020cbdbadf625cd4594368df4acbd9a704d..1c91fc05c42891afdade1f402edf7e2fd8049072 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -628,6 +628,13 @@ const FeatureEntry kFeatureEntries[] = {
|
| IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll,
|
| SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)},
|
| #endif
|
| +#if defined(OS_ANDROID)
|
| + {"enable-osk-overscroll",
|
| + IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME,
|
| + IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION,
|
| + kOsAndroid,
|
| + SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)},
|
| +#endif
|
| // Native client is compiled out when DISABLE_NACL is defined.
|
| #if !defined(DISABLE_NACL)
|
| {"enable-nacl", // FLAGS:RECORD_UMA
|
|
|