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

Unified Diff: chrome/browser/ui/views/tabs/dragged_tab_controller.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
« no previous file with comments | « chrome/browser/ui/views/tabs/base_tab_strip.cc ('k') | chrome/browser/ui/views/tabs/tab.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/dragged_tab_controller.cc
===================================================================
--- chrome/browser/ui/views/tabs/dragged_tab_controller.cc (revision 70685)
+++ chrome/browser/ui/views/tabs/dragged_tab_controller.cc (working copy)
@@ -7,9 +7,6 @@
#include <math.h>
#include <set>
-#include "app/animation.h"
-#include "app/animation_delegate.h"
-#include "app/slide_animation.h"
#include "app/resource_bundle.h"
#include "base/callback.h"
#include "base/i18n/rtl.h"
@@ -33,6 +30,9 @@
#include "gfx/canvas_skia.h"
#include "grit/theme_resources.h"
#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/animation/animation.h"
+#include "ui/base/animation/animation_delegate.h"
+#include "ui/base/animation/slide_animation.h"
#include "views/event.h"
#include "views/widget/root_view.h"
#include "views/widget/widget.h"
@@ -199,7 +199,7 @@
// possible dock position (as represented by DockInfo). DockDisplayer shows
// a window with a DockView in it. Two animations are used that correspond to
// the state of DockInfo::in_enable_area.
-class DraggedTabController::DockDisplayer : public AnimationDelegate {
+class DraggedTabController::DockDisplayer : public ui::AnimationDelegate {
public:
DockDisplayer(DraggedTabController* controller,
const DockInfo& info)
@@ -265,11 +265,11 @@
animation_.Hide();
}
- virtual void AnimationProgressed(const Animation* animation) {
+ virtual void AnimationProgressed(const ui::Animation* animation) {
UpdateLayeredAlpha();
}
- virtual void AnimationEnded(const Animation* animation) {
+ virtual void AnimationEnded(const ui::Animation* animation) {
if (!hidden_)
return;
#if defined(OS_WIN)
@@ -303,7 +303,7 @@
gfx::NativeView popup_view_;
// Animation for when first made visible.
- SlideAnimation animation_;
+ ui::SlideAnimation animation_;
// Have we been hidden?
bool hidden_;
« no previous file with comments | « chrome/browser/ui/views/tabs/base_tab_strip.cc ('k') | chrome/browser/ui/views/tabs/tab.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698