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

Unified Diff: chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc

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/autocomplete/autocomplete_edit_view_gtk.cc
===================================================================
--- chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc (revision 70685)
+++ chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc (working copy)
@@ -10,7 +10,6 @@
#include <algorithm>
#include "app/l10n_util.h"
-#include "app/multi_animation.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
@@ -36,6 +35,7 @@
#include "grit/generated_resources.h"
#include "net/base/escape.h"
#include "third_party/undoview/undo_view.h"
+#include "ui/base/animation/multi_animation.h"
#if defined(TOOLKIT_VIEWS)
#include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h"
@@ -381,12 +381,12 @@
AdjustVerticalAlignmentOfInstantView();
- MultiAnimation::Parts parts;
- parts.push_back(MultiAnimation::Part(
- InstantController::kAutoCommitPauseTimeMS, Tween::ZERO));
- parts.push_back(MultiAnimation::Part(
- InstantController::kAutoCommitFadeInTimeMS, Tween::EASE_IN));
- instant_animation_.reset(new MultiAnimation(parts));
+ ui::MultiAnimation::Parts parts;
+ parts.push_back(ui::MultiAnimation::Part(
+ InstantController::kAutoCommitPauseTimeMS, ui::Tween::ZERO));
+ parts.push_back(ui::MultiAnimation::Part(
+ InstantController::kAutoCommitFadeInTimeMS, ui::Tween::EASE_IN));
+ instant_animation_.reset(new ui::MultiAnimation(parts));
instant_animation_->set_continuous(false);
#if !defined(TOOLKIT_VIEWS)
@@ -798,15 +798,15 @@
SetBaseColor();
}
-void AutocompleteEditViewGtk::AnimationEnded(const Animation* animation) {
+void AutocompleteEditViewGtk::AnimationEnded(const ui::Animation* animation) {
controller_->OnCommitSuggestedText(GetText());
}
-void AutocompleteEditViewGtk::AnimationProgressed(const Animation* animation) {
+void AutocompleteEditViewGtk::AnimationProgressed(const ui::Animation* animation) {
UpdateInstantViewColors();
}
-void AutocompleteEditViewGtk::AnimationCanceled(const Animation* animation) {
+void AutocompleteEditViewGtk::AnimationCanceled(const ui::Animation* animation) {
UpdateInstantViewColors();
}
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_edit_view_gtk.h ('k') | chrome/browser/chromeos/panels/panel_scroller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698