ui/base/animation -> ui/gfx/animation

chrome/browser/ui/views/browser_actions_container.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/ui/views/browser_action_view.h"
 #include "chrome/browser/ui/views/chrome_views_export.h"
 #include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "content/public/browser/notification_observer.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/tween.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/tween.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/resize_area_delegate.h"
 #include "ui/views/drag_controller.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget_observer.h"
 
 class BrowserActionButton;
 class ExtensionKeybindingRegistryViews;
 class ExtensionPopup;
 
 namespace extensions {
 class ActiveTabPermissionGranter;
 }
 
-namespace ui {
+namespace gfx {
 class SlideAnimation;
 }
 
 namespace views {
 class ResizeArea;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // The BrowserActionsContainer is a container view, responsible for drawing the
@@ skipping 63 matching lines @@
 // we make sure to suppress the chevron menu if it wasn't visible. This is
 // because we won't have enough space to show the new Browser Action until the
 // animation ends and we don't want the chevron to flash into view while we are
 // growing the container.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class BrowserActionsContainer
     : public views::View,
       public views::MenuButtonListener,
       public views::ResizeAreaDelegate,
-      public ui::AnimationDelegate,
+      public gfx::AnimationDelegate,
       public ExtensionToolbarModel::Observer,
       public BrowserActionOverflowMenuController::Observer,
       public views::WidgetObserver,
       public BrowserActionView::Delegate,
       public extensions::ExtensionKeybindingRegistry::Delegate {
  public:
   BrowserActionsContainer(Browser* browser, views::View* owner_view);
   virtual ~BrowserActionsContainer();
 
   void Init();
@@ skipping 54 matching lines @@
                                     ui::OSExchangeData* data) OVERRIDE;
   virtual int GetDragOperationsForView(View* sender,
                                        const gfx::Point& p) OVERRIDE;
   virtual bool CanStartDragForView(View* sender,
                                    const gfx::Point& press_pt,
                                    const gfx::Point& p) OVERRIDE;
 
   // Overridden from views::ResizeAreaDelegate:
   virtual void OnResize(int resize_amount, bool done_resizing) OVERRIDE;
 
-  // Overridden from ui::AnimationDelegate:
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
+  // Overridden from gfx::AnimationDelegate:
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
 
   // Overridden from BrowserActionOverflowMenuController::Observer:
   virtual void NotifyMenuDeleted(
       BrowserActionOverflowMenuController* controller) OVERRIDE;
 
   // Overridden from views::WidgetObserver:
   virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
 
   // Overridden from BrowserActionView::Delegate:
   virtual void InspectPopup(ExtensionAction* action) OVERRIDE;
@@ skipping 89 matching lines @@
 
   // Returns the absolute minimum size you can shrink the container down to and
   // still show it.  This assumes a visible chevron because the only way we
   // would not have a chevron when shrinking down this far is if there were no
   // icons, in which case the container wouldn't be shown at all.
   int ContainerMinSize() const;
 
   // 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 incognito.
-  void SaveDesiredSizeAndAnimate(ui::Tween::Type type,
+  void SaveDesiredSizeAndAnimate(gfx::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
   // for incognito.
   bool ShouldDisplayBrowserAction(const extensions::Extension* extension);
 
   // Show a popup.
   void ShowPopup(BrowserActionButton* button,
                  ExtensionPopup::ShowAction show_action);
@@ skipping 28 matching lines @@
   views::ResizeArea* resize_area_;
 
   // The chevron for accessing the overflow items.
   views::MenuButton* chevron_;
 
   // The menu to show for the overflow button (chevron). This class manages its
   // own lifetime so that it can stay alive during drag and drop operations.
   BrowserActionOverflowMenuController* overflow_menu_;
 
   // The animation that happens when the container snaps to place.
-  scoped_ptr<ui::SlideAnimation> resize_animation_;
+  scoped_ptr<gfx::SlideAnimation> resize_animation_;
 
   // Don't show the chevron while animating.
   bool suppress_chevron_;
 
   // This is used while the user is resizing (and when the animations are in
   // progress) to know how wide the delta is between the current state and what
   // we should draw.
   int resize_amount_;
 
   // Keeps track of the absolute pixel width the container should have when we
   // are done animating.
   int animation_target_size_;
 
   // The x position for where to draw the drop indicator. -1 if no indicator.
   int drop_indicator_position_;
 
   // The class that registers for keyboard shortcuts for extension commands.
   scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
 
   base::WeakPtrFactory<BrowserActionsContainer> task_factory_;
 
   // Handles delayed showing of the overflow menu when hovering.
   base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_