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

Unified Diff: chrome/browser/gtk/status_bubble_gtk.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/gtk/status_bubble_gtk.h ('k') | chrome/browser/gtk/tabs/dragged_tab_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/status_bubble_gtk.cc
===================================================================
--- chrome/browser/gtk/status_bubble_gtk.cc (revision 70685)
+++ chrome/browser/gtk/status_bubble_gtk.cc (working copy)
@@ -8,7 +8,6 @@
#include <algorithm>
-#include "app/slide_animation.h"
#include "app/text_elider.h"
#include "base/i18n/rtl.h"
#include "base/message_loop.h"
@@ -18,6 +17,7 @@
#include "chrome/browser/gtk/rounded_window.h"
#include "chrome/browser/gtk/slide_animator_gtk.h"
#include "chrome/common/notification_service.h"
+#include "ui/base/animation/slide_animation.h"
namespace {
@@ -315,8 +315,8 @@
void StatusBubbleGtk::ExpandURL() {
start_width_ = label_->allocation.width;
- expand_animation_.reset(new SlideAnimation(this));
- expand_animation_->SetTweenType(Tween::LINEAR);
+ expand_animation_.reset(new ui::SlideAnimation(this));
+ expand_animation_->SetTweenType(ui::Tween::LINEAR);
expand_animation_->Show();
SetStatusTextToURL();
@@ -339,10 +339,10 @@
return FALSE;
}
-void StatusBubbleGtk::AnimationEnded(const Animation* animation) {
+void StatusBubbleGtk::AnimationEnded(const ui::Animation* animation) {
UpdateLabelSizeRequest();
}
-void StatusBubbleGtk::AnimationProgressed(const Animation* animation) {
+void StatusBubbleGtk::AnimationProgressed(const ui::Animation* animation) {
UpdateLabelSizeRequest();
}
« no previous file with comments | « chrome/browser/gtk/status_bubble_gtk.h ('k') | chrome/browser/gtk/tabs/dragged_tab_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698