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

Unified Diff: chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h

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
Index: chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
===================================================================
--- chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h (revision 70685)
+++ chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h (working copy)
@@ -6,12 +6,12 @@
#define CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
#pragma once
-#include "app/animation_delegate.h"
-#include "app/slide_animation.h"
#include "chrome/browser/autocomplete/autocomplete.h"
#include "chrome/browser/autocomplete/autocomplete_popup_model.h"
#include "chrome/browser/autocomplete/autocomplete_popup_view.h"
#include "gfx/font.h"
+#include "ui/base/animation/animation_delegate.h"
+#include "ui/base/animation/slide_animation.h"
#include "views/view.h"
#include "webkit/glue/window_open_disposition.h"
@@ -46,7 +46,7 @@
class AutocompletePopupContentsView : public views::View,
public AutocompleteResultViewModel,
public AutocompletePopupView,
- public AnimationDelegate {
+ public ui::AnimationDelegate {
public:
AutocompletePopupContentsView(const gfx::Font& font,
AutocompleteEditView* edit_view,
@@ -73,8 +73,8 @@
virtual bool IsHoveredIndex(size_t index) const;
virtual const SkBitmap* GetSpecialIcon(size_t index) const;
- // Overridden from AnimationDelegate:
- virtual void AnimationProgressed(const Animation* animation);
+ // Overridden from ui::AnimationDelegate:
+ virtual void AnimationProgressed(const ui::Animation* animation);
// Overridden from views::View:
virtual void Paint(gfx::Canvas* canvas);
@@ -165,7 +165,7 @@
// The popup sizes vertically using an animation when the popup is getting
// shorter (not larger, that makes it look "slow").
- SlideAnimation size_animation_;
+ ui::SlideAnimation size_animation_;
gfx::Rect start_bounds_;
gfx::Rect target_bounds_;

Powered by Google App Engine
This is Rietveld 408576698