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

Side by Side Diff: ui/gfx/animation/animation.cc

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 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 | « ui/gfx/animation/animation.h ('k') | ui/gfx/animation/animation_container.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/base/animation/animation.h" 5 #include "ui/gfx/animation/animation.h"
6 6
7 #include "ui/base/animation/animation_container.h" 7 #include "ui/gfx/animation/animation_container.h"
8 #include "ui/base/animation/animation_delegate.h" 8 #include "ui/gfx/animation/animation_delegate.h"
9 #include "ui/base/animation/tween.h" 9 #include "ui/gfx/animation/tween.h"
10 #include "ui/gfx/rect.h" 10 #include "ui/gfx/rect.h"
11 11
12 #if defined(OS_WIN) 12 #if defined(OS_WIN)
13 #include "base/win/windows_version.h" 13 #include "base/win/windows_version.h"
14 #endif 14 #endif
15 15
16 namespace ui { 16 namespace gfx {
17 17
18 Animation::Animation(base::TimeDelta timer_interval) 18 Animation::Animation(base::TimeDelta timer_interval)
19 : timer_interval_(timer_interval), 19 : timer_interval_(timer_interval),
20 is_animating_(false), 20 is_animating_(false),
21 delegate_(NULL) { 21 delegate_(NULL) {
22 } 22 }
23 23
24 Animation::~Animation() { 24 Animation::~Animation() {
25 // Don't send out notification from the destructor. Chances are the delegate 25 // Don't send out notification from the destructor. Chances are the delegate
26 // owns us and is being deleted as well. 26 // owns us and is being deleted as well.
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 } 114 }
115 115
116 void Animation::SetStartTime(base::TimeTicks start_time) { 116 void Animation::SetStartTime(base::TimeTicks start_time) {
117 start_time_ = start_time; 117 start_time_ = start_time;
118 } 118 }
119 119
120 base::TimeDelta Animation::GetTimerInterval() const { 120 base::TimeDelta Animation::GetTimerInterval() const {
121 return timer_interval_; 121 return timer_interval_;
122 } 122 }
123 123
124 } // namespace ui 124 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/animation/animation.h ('k') | ui/gfx/animation/animation_container.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698