Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(564)

Side by Side Diff: cc/scrollbar_animation_controller.cc

Issue 11145033: cc: Get rid of CC*.h temporary header files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased - fixed the conflicts hopefuly Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/scoped_thread_proxy.cc ('k') | cc/scrollbar_animation_controller_linear_fade.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "CCScrollbarAnimationController.h" 7 #include "cc/scrollbar_animation_controller.h"
8 8
9 #include "CCScrollbarLayerImpl.h" 9 #include "CCScrollbarLayerImpl.h"
10 #include <wtf/CurrentTime.h> 10 #include <wtf/CurrentTime.h>
11 11
12 #if OS(ANDROID) 12 #if OS(ANDROID)
13 #include "CCScrollbarAnimationControllerLinearFade.h" 13 #include "CCScrollbarAnimationControllerLinearFade.h"
14 #endif 14 #endif
15 15
16 namespace cc { 16 namespace cc {
17 17
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 } 88 }
89 89
90 if (m_verticalScrollbarLayer) { 90 if (m_verticalScrollbarLayer) {
91 m_verticalScrollbarLayer->setCurrentPos(m_currentPos.y()); 91 m_verticalScrollbarLayer->setCurrentPos(m_currentPos.y());
92 m_verticalScrollbarLayer->setTotalSize(m_totalSize.height()); 92 m_verticalScrollbarLayer->setTotalSize(m_totalSize.height());
93 m_verticalScrollbarLayer->setMaximum(m_maximum.height()); 93 m_verticalScrollbarLayer->setMaximum(m_maximum.height());
94 } 94 }
95 } 95 }
96 96
97 } // namespace cc 97 } // namespace cc
OLDNEW
« no previous file with comments | « cc/scoped_thread_proxy.cc ('k') | cc/scrollbar_animation_controller_linear_fade.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698