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

Unified Diff: chrome/browser/autocomplete/autocomplete_edit_view_gtk.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
« no previous file with comments | « build/all.gyp ('k') | chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
===================================================================
--- chrome/browser/autocomplete/autocomplete_edit_view_gtk.h (revision 70685)
+++ chrome/browser/autocomplete/autocomplete_edit_view_gtk.h (working copy)
@@ -11,7 +11,6 @@
#include <algorithm>
#include <string>
-#include "app/animation_delegate.h"
#include "app/gtk_signal.h"
#include "app/gtk_signal_registrar.h"
#include "base/basictypes.h"
@@ -24,19 +23,23 @@
#include "chrome/common/notification_registrar.h"
#include "chrome/common/page_transition_types.h"
#include "gfx/rect.h"
+#include "ui/base/animation/animation_delegate.h"
#include "webkit/glue/window_open_disposition.h"
class AutocompleteEditController;
class AutocompleteEditModel;
class AutocompletePopupView;
-class MultiAnimation;
class Profile;
class TabContents;
-namespace gfx{
+namespace gfx {
class Font;
}
+namespace ui {
+class MultiAnimation;
+}
+
namespace views {
class View;
}
@@ -47,7 +50,7 @@
class AutocompleteEditViewGtk : public AutocompleteEditView,
public NotificationObserver,
- public AnimationDelegate {
+ public ui::AnimationDelegate {
public:
// Modeled like the Windows CHARRANGE. Represent a pair of cursor position
// offsets. Since GtkTextIters are invalid after the buffer is changed, we
@@ -149,10 +152,10 @@
const NotificationSource& source,
const NotificationDetails& details);
- // Overridden from AnimationDelegate.
- virtual void AnimationEnded(const Animation* animation);
- virtual void AnimationProgressed(const Animation* animation);
- virtual void AnimationCanceled(const Animation* animation);
+ // Overridden from ui::AnimationDelegate.
+ virtual void AnimationEnded(const ui::Animation* animation);
+ virtual void AnimationProgressed(const ui::Animation* animation);
+ virtual void AnimationCanceled(const ui::Animation* animation);
// Sets the colors of the text view according to the theme.
void SetBaseColor();
@@ -366,7 +369,7 @@
GtkWidget* instant_view_;
// Animation from instant suggest (faded text) to autocomplete (selected
// text).
- scoped_ptr<MultiAnimation> instant_animation_;
+ scoped_ptr<ui::MultiAnimation> instant_animation_;
// A mark to split the content and the instant anchor. Wherever the end
// iterator of the text buffer is required, the iterator to this mark should
« no previous file with comments | « build/all.gyp ('k') | chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698