From 678e68ab1a5fa99f07634cce9ac22a6d700436df Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Thu, 1 Sep 2011 15:23:56 +0000 Subject: Enable smooth scrolling on mac This confuses a few unit tests, so add some machinery to disable the feature in tests and do so in the tests that need it. BUG=61140,575 TEST=Go to en.wikipedia.org, hit space. Scroll should be animated. Review URL: http://codereview.chromium.org/7693019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99186 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/ui/ppapi_uitest.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'chrome/test') diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc index d8bac7c..3ee3a69 100644 --- a/chrome/test/ui/ppapi_uitest.cc +++ b/chrome/test/ui/ppapi_uitest.cc @@ -6,6 +6,7 @@ #include "base/path_service.h" #include "base/test/test_timeouts.h" #include "build/build_config.h" +#include "content/common/content_switches.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/ui/ui_test.h" @@ -55,6 +56,9 @@ class PPAPITest : public UITest { // TODO(dumi): remove this switch once we have a quota management // system in place. launch_arguments_.AppendSwitch(switches::kUnlimitedQuotaForFiles); + + // Smooth scrolling confuses the scrollbar test. + launch_arguments_.AppendSwitch(switches::kDisableSmoothScrolling); } void RunTest(const std::string& test_case) { -- cgit v1.1