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

Unified Diff: chrome/browser/ui/views/frame/contents_container.cc

Issue 6154001: Move animation code to new ui/base/animation directory.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/contents_container.cc
===================================================================
--- chrome/browser/ui/views/frame/contents_container.cc (revision 70685)
+++ chrome/browser/ui/views/frame/contents_container.cc (working copy)
@@ -4,9 +4,9 @@
#include "chrome/browser/views/frame/contents_container.h"
-#include "app/slide_animation.h"
#include "base/logging.h"
#include "third_party/skia/include/core/SkColor.h"
+#include "ui/base/animation/slide_animation.h"
#include "views/background.h"
#include "views/widget/root_view.h"
#include "views/widget/widget.h"
@@ -95,7 +95,7 @@
}
void ContentsContainer::FadeActiveContents() {
- if (active_overlay_ || !Animation::ShouldRenderRichAnimation())
+ if (active_overlay_ || !ui::Animation::ShouldRenderRichAnimation())
return;
#if !defined(OS_WIN)
@@ -104,7 +104,7 @@
return;
#endif
- overlay_animation_.reset(new SlideAnimation(this));
+ overlay_animation_.reset(new ui::SlideAnimation(this));
overlay_animation_->SetDuration(300);
overlay_animation_->SetSlideDuration(300);
overlay_animation_->Show();
@@ -113,7 +113,7 @@
}
void ContentsContainer::ShowFade() {
- if (active_overlay_ || !Animation::ShouldRenderRichAnimation())
+ if (active_overlay_ || !ui::Animation::ShouldRenderRichAnimation())
return;
CreateOverlay(kMaxOpacity);
@@ -129,10 +129,10 @@
}
}
-void ContentsContainer::AnimationProgressed(const Animation* animation) {
+void ContentsContainer::AnimationProgressed(const ui::Animation* animation) {
active_overlay_->SetOpacity(
- Tween::ValueBetween(animation->GetCurrentValue(), kMinOpacity,
- kMaxOpacity));
+ ui::Tween::ValueBetween(animation->GetCurrentValue(), kMinOpacity,
+ kMaxOpacity));
active_overlay_->GetRootView()->SchedulePaint();
}
« no previous file with comments | « chrome/browser/ui/views/frame/contents_container.h ('k') | chrome/browser/ui/views/fullscreen_exit_bubble.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698