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

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_result_view.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/views/omnibox/omnibox_result_view.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
index 8afee9338ceb3a2bee36508f1314f60c641cdae5..85d9f3fb10e1f26eff5292fabbdda9c8e6348cd6 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
@@ -121,7 +121,7 @@ OmniboxResultView::OmniboxResultView(
string16(kEllipsis))),
mirroring_context_(new MirroringContext()),
keyword_icon_(new views::ImageView()),
- animation_(new ui::SlideAnimation(this)) {
+ animation_(new gfx::SlideAnimation(this)) {
CHECK_GE(model_index, 0);
if (default_icon_size_ == 0) {
default_icon_size_ =
@@ -627,7 +627,7 @@ void OmniboxResultView::OnPaint(gfx::Canvas* canvas) {
}
}
-void OmniboxResultView::AnimationProgressed(const ui::Animation* animation) {
+void OmniboxResultView::AnimationProgressed(const gfx::Animation* animation) {
Layout();
SchedulePaint();
}
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_result_view.h ('k') | chrome/browser/ui/views/panels/panel_stack_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698