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

Unified Diff: chrome/browser/ui/gtk/location_bar_view_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
Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index 66b4b0ced5a06cb3ca998f1c46026a6c177fc252..b4837c1aa9eb83516de2045371fa6f4f3e7269b2 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -183,8 +183,8 @@ class ContentSettingImageViewGtk : public LocationBarViewGtk::PageToolViewGtk,
virtual void UpdatePreLayout(WebContents* web_contents) OVERRIDE;
virtual void UpdatePostLayout(WebContents* web_contents) OVERRIDE;
- // ui::AnimationDelegate
- virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
+ // gfx::AnimationDelegate
+ virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
private:
// PageToolViewGtk
@@ -288,7 +288,7 @@ void ContentSettingImageViewGtk::UpdatePostLayout(WebContents* web_contents) {
}
void ContentSettingImageViewGtk::AnimationEnded(
- const ui::Animation* animation) {
+ const gfx::Animation* animation) {
if (animation_.IsShowing()) {
base::MessageLoop::current()->PostDelayedTask(
FROM_HERE,
@@ -1810,7 +1810,7 @@ void LocationBarViewGtk::PageToolViewGtk::CloseAnimation() {
}
void LocationBarViewGtk::PageToolViewGtk::AnimationProgressed(
- const ui::Animation* animation) {
+ const gfx::Animation* animation) {
gtk_widget_set_size_request(
label_.get(),
animation->GetCurrentValue() * label_req_.width,
@@ -1818,11 +1818,11 @@ void LocationBarViewGtk::PageToolViewGtk::AnimationProgressed(
}
void LocationBarViewGtk::PageToolViewGtk::AnimationEnded(
- const ui::Animation* animation) {
+ const gfx::Animation* animation) {
}
void LocationBarViewGtk::PageToolViewGtk::AnimationCanceled(
- const ui::Animation* animation) {
+ const gfx::Animation* animation) {
}
gboolean LocationBarViewGtk::PageToolViewGtk::OnButtonPressed(
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk.h ('k') | chrome/browser/ui/gtk/notifications/balloon_view_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698