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

Unified Diff: chrome/browser/ui/views/bookmark_bar_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/bookmark_bar_view.h
===================================================================
--- chrome/browser/ui/views/bookmark_bar_view.h (revision 70685)
+++ chrome/browser/ui/views/bookmark_bar_view.h (working copy)
@@ -8,7 +8,6 @@
#include <set>
-#include "app/animation_delegate.h"
#include "chrome/browser/bookmarks/bookmark_node_data.h"
#include "chrome/browser/bookmarks/bookmark_model_observer.h"
#include "chrome/browser/sync/profile_sync_service.h"
@@ -16,13 +15,17 @@
#include "chrome/browser/views/bookmark_menu_controller_views.h"
#include "chrome/browser/views/detachable_toolbar_view.h"
#include "chrome/common/notification_registrar.h"
+#include "ui/base/animation/animation_delegate.h"
#include "views/controls/button/button.h"
#include "views/controls/menu/view_menu_delegate.h"
class Browser;
class PageNavigator;
class PrefService;
+
+namespace ui {
class SlideAnimation;
+}
namespace views {
class CustomButton;
@@ -46,7 +49,7 @@
public NotificationObserver,
public views::ContextMenuController,
public views::DragController,
- public AnimationDelegate,
+ public ui::AnimationDelegate,
public BookmarkMenuController::Observer,
public BookmarkBarInstructionsView::Delegate {
friend class ShowFolderMenuTask;
@@ -180,8 +183,8 @@
bool is_animating();
// SlideAnimationDelegate implementation.
- void AnimationProgressed(const Animation* animation);
- void AnimationEnded(const Animation* animation);
+ void AnimationProgressed(const ui::Animation* animation);
+ void AnimationEnded(const ui::Animation* animation);
// BookmarkMenuController::Observer
virtual void BookmarkMenuDeleted(BookmarkMenuController* controller);
@@ -491,7 +494,7 @@
bool infobar_visible_;
// Animation controlling showing and hiding of the bar.
- scoped_ptr<SlideAnimation> size_animation_;
+ scoped_ptr<ui::SlideAnimation> size_animation_;
// If the bookmark bubble is showing, this is the visible ancestor of the URL.
// The visible ancestor is either the other_bookmarked_button_,
« no previous file with comments | « chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc ('k') | chrome/browser/ui/views/bookmark_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698