summaryrefslogtreecommitdiffstats
path: root/cc/scrollbar_animation_controller_linear_fade.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-16 03:10:58 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-16 03:10:58 +0000
commitc3545dd39cd072aba62fcbee584eb6d7b84df18b (patch)
tree04d65193b4e3cda3a75f4b8e978c502c258cf6ab /cc/scrollbar_animation_controller_linear_fade.cc
parent0c2286e417d1427f48a1296460b10c7e442a2f19 (diff)
downloadchromium_src-c3545dd39cd072aba62fcbee584eb6d7b84df18b.zip
chromium_src-c3545dd39cd072aba62fcbee584eb6d7b84df18b.tar.gz
chromium_src-c3545dd39cd072aba62fcbee584eb6d7b84df18b.tar.bz2
cc: Remove wtf includes from layer_impl.h
R=jamesr@chromium.org BUG=154451 Review URL: https://chromiumcodereview.appspot.com/11138029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162060 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/scrollbar_animation_controller_linear_fade.cc')
-rw-r--r--cc/scrollbar_animation_controller_linear_fade.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/scrollbar_animation_controller_linear_fade.cc b/cc/scrollbar_animation_controller_linear_fade.cc
index 95ad198..35b5261 100644
--- a/cc/scrollbar_animation_controller_linear_fade.cc
+++ b/cc/scrollbar_animation_controller_linear_fade.cc
@@ -10,9 +10,9 @@
namespace cc {
-PassOwnPtr<CCScrollbarAnimationControllerLinearFade> CCScrollbarAnimationControllerLinearFade::create(CCLayerImpl* scrollLayer, double fadeoutDelay, double fadeoutLength)
+scoped_ptr<CCScrollbarAnimationControllerLinearFade> CCScrollbarAnimationControllerLinearFade::create(CCLayerImpl* scrollLayer, double fadeoutDelay, double fadeoutLength)
{
- return adoptPtr(new CCScrollbarAnimationControllerLinearFade(scrollLayer, fadeoutDelay, fadeoutLength));
+ return make_scoped_ptr(new CCScrollbarAnimationControllerLinearFade(scrollLayer, fadeoutDelay, fadeoutLength));
}
CCScrollbarAnimationControllerLinearFade::CCScrollbarAnimationControllerLinearFade(CCLayerImpl* scrollLayer, double fadeoutDelay, double fadeoutLength)