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 /base | |
| 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 'base')
| -rw-r--r-- | base/test/mock_time_provider.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/base/test/mock_time_provider.h b/base/test/mock_time_provider.h index 9ff46e4..48ddb41 100644 --- a/base/test/mock_time_provider.h +++ b/base/test/mock_time_provider.h @@ -39,11 +39,12 @@ // ASSERT_EQ(elapsed, TimeDelta::FromSeconds(6)); // } -#include "base/time.h" -#include "testing/gmock/include/gmock/gmock.h" - #ifndef BASE_TEST_MOCK_TIME_PROVIDER_H_ #define BASE_TEST_MOCK_TIME_PROVIDER_H_ +#pragma once + +#include "base/time.h" +#include "testing/gmock/include/gmock/gmock.h" namespace base { |