diff options
| -rw-r--r-- | chrome/browser/about_flags.cc | 5 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_view_host_impl.cc | 5 | ||||
| -rw-r--r-- | tools/metrics/actions/actions.xml | 8 |
3 files changed, 14 insertions, 4 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index b06ac05..b78f557 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -669,11 +669,12 @@ const FeatureEntry kFeatureEntries[] = { IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_NAME, IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_DESCRIPTION, kOsAll, SINGLE_VALUE_TYPE(autofill::switches::kShowAutofillTypePredictions)}, - {"disable-smooth-scrolling", // FLAGS:RECORD_UMA + {"smooth-scrolling", // FLAGS:RECORD_UMA IDS_FLAGS_SMOOTH_SCROLLING_NAME, IDS_FLAGS_SMOOTH_SCROLLING_DESCRIPTION, // Mac has a separate implementation with its own setting to disable. kOsLinux | kOsCrOS | kOsWin | kOsAndroid, - SINGLE_DISABLE_VALUE_TYPE(switches::kDisableSmoothScrolling)}, + ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling, + switches::kDisableSmoothScrolling)}, #if defined(USE_AURA) || defined(OS_LINUX) {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME, IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION, diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index 2dc2f74..aae3040 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -479,8 +479,9 @@ WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() { !command_line.HasSwitch(switches::kDisableTouchAdjustment); prefs.enable_scroll_animator = - !command_line.HasSwitch(switches::kDisableSmoothScrolling) && - gfx::Animation::ScrollAnimationsEnabledBySystem(); + command_line.HasSwitch(switches::kEnableSmoothScrolling) || + (!command_line.HasSwitch(switches::kDisableSmoothScrolling) && + gfx::Animation::ScrollAnimationsEnabledBySystem()); // Certain GPU features might have been blacklisted. GpuDataManagerImpl::GetInstance()->UpdateRendererWebPrefs(&prefs); diff --git a/tools/metrics/actions/actions.xml b/tools/metrics/actions/actions.xml index a438240..03d73bd4 100644 --- a/tools/metrics/actions/actions.xml +++ b/tools/metrics/actions/actions.xml @@ -136,6 +136,7 @@ should be able to be added at any place in this file. <description> User flag to disable smooth scroll animations on wheel and keyboard input. </description> + <obsolete>This flag no longer exists.</obsolete> </action> <action name="AboutFlags_disable-views-rect-based-targeting"> @@ -299,6 +300,13 @@ should be able to be added at any place in this file. <description>Please enter the description of this user action.</description> </action> +<action name="AboutFlags_smooth-scrolling"> + <owner>skobes@chromium.org</owner> + <description> + User flag to disable smooth scroll animations on wheel and keyboard input. + </description> +</action> + <action name="AboutFlags_snap-start"> <owner>Please list the metric's owners. Add more owner tags as needed.</owner> <description>Please enter the description of this user action.</description> |