From f676780687464428e340d008a0d1ca13d9944628 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Fri, 7 Jan 2011 17:33:39 +0000 Subject: Move animation code to new ui/base/animation directory. BUG=none TEST=none TBR=brettw Review URL: http://codereview.chromium.org/6154001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70743 0039d316-1c4b-4281-b951-d872f2087c98 --- .../browser/ui/views/browser_actions_container.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'chrome/browser/ui/views/browser_actions_container.h') diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h index 62b567f..5291ece 100644 --- a/chrome/browser/ui/views/browser_actions_container.h +++ b/chrome/browser/ui/views/browser_actions_container.h @@ -10,8 +10,6 @@ #include #include -#include "app/animation_delegate.h" -#include "app/tween.h" #include "base/task.h" #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/extensions/extension_toolbar_model.h" @@ -21,6 +19,8 @@ #include "chrome/browser/views/extensions/extension_popup.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "ui/base/animation/animation_delegate.h" +#include "ui/base/animation/tween.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/view_menu_delegate.h" #include "views/controls/resize_area.h" @@ -35,12 +35,15 @@ class ExtensionAction; class ExtensionPopup; class PrefService; class Profile; -class SlideAnimation; namespace gfx { class CanvasSkia; } +namespace ui { +class SlideAnimation; +} + namespace views { class Menu2; } @@ -254,7 +257,7 @@ class BrowserActionsContainer public views::ViewMenuDelegate, public views::DragController, public views::ResizeArea::ResizeAreaDelegate, - public AnimationDelegate, + public ui::AnimationDelegate, public ExtensionToolbarModel::Observer, public BrowserActionOverflowMenuController::Observer, public ExtensionContextMenuModel::PopupDelegate, @@ -345,9 +348,9 @@ class BrowserActionsContainer // Overridden from ResizeArea::ResizeAreaDelegate: virtual void OnResize(int resize_amount, bool done_resizing); - // Overridden from AnimationDelegate: - virtual void AnimationProgressed(const Animation* animation); - virtual void AnimationEnded(const Animation* animation); + // Overridden from ui::AnimationDelegate: + virtual void AnimationProgressed(const ui::Animation* animation); + virtual void AnimationEnded(const ui::Animation* animation); // Overridden from BrowserActionOverflowMenuController::Observer: virtual void NotifyMenuDeleted( @@ -439,7 +442,8 @@ class BrowserActionsContainer // Animate to the target size (unless testing, in which case we go straight to // the target size). This also saves the target number of visible icons in // the pref if we're not off the record. - void SaveDesiredSizeAndAnimate(Tween::Type type, size_t num_visible_icons); + void SaveDesiredSizeAndAnimate(ui::Tween::Type type, + size_t num_visible_icons); // Returns true if this extension should be shown in this toolbar. This can // return false if we are in an incognito window and the extension is disabled @@ -483,7 +487,7 @@ class BrowserActionsContainer BrowserActionOverflowMenuController* overflow_menu_; // The animation that happens when the container snaps to place. - scoped_ptr resize_animation_; + scoped_ptr resize_animation_; // Don't show the chevron while animating. bool suppress_chevron_; -- cgit v1.1