diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-15 17:29:30 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-15 17:29:30 +0000 |
commit | ffb15d1eb8fc4180b30b43865fc44427f29cd578 (patch) | |
tree | ea89569dc78f3a5a103dfb7eef8a4b5bc8879268 /chrome/browser/ui/panels | |
parent | 70cdf8d473698e4f9203dde64bfa9147dc4d70e7 (diff) | |
download | chromium_src-ffb15d1eb8fc4180b30b43865fc44427f29cd578.zip chromium_src-ffb15d1eb8fc4180b30b43865fc44427f29cd578.tar.gz chromium_src-ffb15d1eb8fc4180b30b43865fc44427f29cd578.tar.bz2 |
ui/base/animation -> ui/gfx/animation
I also made GFX_EXPORT real, which is ok since it's the same as
UI_EXPORT. It'll only matter when we separate out at gyp level.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/23531053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/panels')
-rw-r--r-- | chrome/browser/ui/panels/panel_bounds_animation.cc | 6 | ||||
-rw-r--r-- | chrome/browser/ui/panels/panel_bounds_animation.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/ui/panels/panel_bounds_animation.cc b/chrome/browser/ui/panels/panel_bounds_animation.cc index 63739bb..b596f84 100644 --- a/chrome/browser/ui/panels/panel_bounds_animation.cc +++ b/chrome/browser/ui/panels/panel_bounds_animation.cc @@ -16,11 +16,11 @@ const int kSetBoundsAnimationBigMinimizeMs = 1500; } -PanelBoundsAnimation::PanelBoundsAnimation(ui::AnimationDelegate* target, +PanelBoundsAnimation::PanelBoundsAnimation(gfx::AnimationDelegate* target, Panel* panel, const gfx::Rect& initial_bounds, const gfx::Rect& final_bounds) - : ui::LinearAnimation(kDefaultFramerateHz, target), + : gfx::LinearAnimation(kDefaultFramerateHz, target), panel_(panel), for_big_minimize_(false), animation_stop_to_show_titlebar_(0) { @@ -47,7 +47,7 @@ PanelBoundsAnimation::~PanelBoundsAnimation() { } double PanelBoundsAnimation::GetCurrentValue() const { - return ComputeAnimationValue(ui::LinearAnimation::GetCurrentValue(), + return ComputeAnimationValue(gfx::LinearAnimation::GetCurrentValue(), for_big_minimize_, animation_stop_to_show_titlebar_); } diff --git a/chrome/browser/ui/panels/panel_bounds_animation.h b/chrome/browser/ui/panels/panel_bounds_animation.h index 0880315..16bde4a 100644 --- a/chrome/browser/ui/panels/panel_bounds_animation.h +++ b/chrome/browser/ui/panels/panel_bounds_animation.h @@ -5,16 +5,16 @@ #ifndef CHROME_BROWSER_UI_PANELS_PANEL_BOUNDS_ANIMATION_H_ #define CHROME_BROWSER_UI_PANELS_PANEL_BOUNDS_ANIMATION_H_ -#include "ui/base/animation/linear_animation.h" +#include "ui/gfx/animation/linear_animation.h" -namespace ui { +namespace gfx { class AnimationDelegate; } class Panel; -class PanelBoundsAnimation : public ui::LinearAnimation { +class PanelBoundsAnimation : public gfx::LinearAnimation { public: - PanelBoundsAnimation(ui::AnimationDelegate* target, + PanelBoundsAnimation(gfx::AnimationDelegate* target, Panel* panel, const gfx::Rect& initial_bounds, const gfx::Rect& final_bounds); |