diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 15:23:56 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 15:23:56 +0000 |
| commit | 678e68ab1a5fa99f07634cce9ac22a6d700436df (patch) | |
| tree | 86faec083f04f6b58b7366f5750cb802d16a5d0e /chrome/test/ui | |
| parent | d49eebd7d137ca82ee7eeb206788a24fb99b7dbc (diff) | |
| download | chromium_src-678e68ab1a5fa99f07634cce9ac22a6d700436df.zip chromium_src-678e68ab1a5fa99f07634cce9ac22a6d700436df.tar.gz chromium_src-678e68ab1a5fa99f07634cce9ac22a6d700436df.tar.bz2 | |
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
Diffstat (limited to 'chrome/test/ui')
| -rw-r--r-- | chrome/test/ui/ppapi_uitest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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) { |