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

Unified Diff: chrome/browser/ui/gtk/status_bubble_gtk.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/gtk/status_bubble_gtk.h ('k') | chrome/browser/ui/gtk/tabs/dragged_view_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/status_bubble_gtk.cc
diff --git a/chrome/browser/ui/gtk/status_bubble_gtk.cc b/chrome/browser/ui/gtk/status_bubble_gtk.cc
index 8de11de254ad32b3101fb9b97903a0f90a8ce07d..2fb6e19edcc6d623c6b2781d82cde9b113864c16 100644
--- a/chrome/browser/ui/gtk/status_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/status_bubble_gtk.cc
@@ -17,8 +17,8 @@
#include "chrome/browser/ui/gtk/gtk_util.h"
#include "chrome/browser/ui/gtk/rounded_window.h"
#include "content/public/browser/notification_source.h"
-#include "ui/base/animation/slide_animation.h"
#include "ui/base/gtk/gtk_hig_constants.h"
+#include "ui/gfx/animation/slide_animation.h"
#include "ui/gfx/font.h"
#include "ui/gfx/gtk_compat.h"
#include "ui/gfx/text_elider.h"
@@ -340,8 +340,8 @@ void StatusBubbleGtk::ExpandURL() {
GtkAllocation allocation;
gtk_widget_get_allocation(label_.get(), &allocation);
start_width_ = allocation.width;
- expand_animation_.reset(new ui::SlideAnimation(this));
- expand_animation_->SetTweenType(ui::Tween::LINEAR);
+ expand_animation_.reset(new gfx::SlideAnimation(this));
+ expand_animation_->SetTweenType(gfx::Tween::LINEAR);
expand_animation_->Show();
SetStatusTextToURL();
@@ -372,10 +372,10 @@ gboolean StatusBubbleGtk::HandleMotionNotify(GtkWidget* sender,
return FALSE;
}
-void StatusBubbleGtk::AnimationEnded(const ui::Animation* animation) {
+void StatusBubbleGtk::AnimationEnded(const gfx::Animation* animation) {
UpdateLabelSizeRequest();
}
-void StatusBubbleGtk::AnimationProgressed(const ui::Animation* animation) {
+void StatusBubbleGtk::AnimationProgressed(const gfx::Animation* animation) {
UpdateLabelSizeRequest();
}
« no previous file with comments | « chrome/browser/ui/gtk/status_bubble_gtk.h ('k') | chrome/browser/ui/gtk/tabs/dragged_view_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698