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

Unified Diff: chrome/browser/ui/views/panels/panel_stack_view.h

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 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/panels/panel_stack_view.h
diff --git a/chrome/browser/ui/views/panels/panel_stack_view.h b/chrome/browser/ui/views/panels/panel_stack_view.h
index 18cba8c5a69f47ebc47d0b4f34d250e7bda43753..8373b5bddaef16273372e86a941e2fcbab00f5cc 100644
--- a/chrome/browser/ui/views/panels/panel_stack_view.h
+++ b/chrome/browser/ui/views/panels/panel_stack_view.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/ui/panels/native_panel_stack_window.h"
-#include "ui/base/animation/animation_delegate.h"
+#include "ui/gfx/animation/animation_delegate.h"
#include "ui/views/focus/widget_focus_manager.h"
#include "ui/views/widget/widget_delegate.h"
#include "ui/views/widget/widget_observer.h"
@@ -20,7 +20,7 @@
#include "ui/base/win/hwnd_subclass.h"
#endif
-namespace ui {
+namespace gfx {
class LinearAnimation;
}
namespace views {
@@ -37,7 +37,7 @@ class PanelStackView : public NativePanelStackWindow,
public ui::HWNDMessageFilter,
public TaskbarWindowThumbnailerDelegateWin,
#endif
- public ui::AnimationDelegate {
+ public gfx::AnimationDelegate {
public:
explicit PanelStackView(NativePanelStackWindowDelegate* delegate);
virtual ~PanelStackView();
@@ -83,8 +83,8 @@ class PanelStackView : public NativePanelStackWindow,
gfx::NativeView focused_now) OVERRIDE;
// Overridden from AnimationDelegate:
- virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
- virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+ virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
+ virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
// Updates the bounds of panels as specified in batch update data.
void UpdatePanelsBounds();
@@ -152,7 +152,7 @@ class PanelStackView : public NativePanelStackWindow,
BoundsUpdates bounds_updates_;
// Used to animate the bounds changes at a synchronized pace.
- scoped_ptr<ui::LinearAnimation> bounds_animator_;
+ scoped_ptr<gfx::LinearAnimation> bounds_animator_;
DISALLOW_COPY_AND_ASSIGN(PanelStackView);
};
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_result_view.cc ('k') | chrome/browser/ui/views/panels/panel_stack_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698