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

Unified Diff: chrome/browser/ui/views/fullscreen_exit_bubble_views.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/fullscreen_exit_bubble_views.h
diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.h b/chrome/browser/ui/views/fullscreen_exit_bubble_views.h
index d98de0c543a909dd1c173f7ab361383448cf9925..116a8d914f86ed043ba75fb6c4d7b06ff0864742 100644
--- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.h
+++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.h
@@ -14,7 +14,7 @@
class BrowserView;
class GURL;
-namespace ui {
+namespace gfx {
class SlideAnimation;
}
namespace views {
@@ -63,8 +63,8 @@ class FullscreenExitBubbleViews : public FullscreenExitBubble,
views::View* GetBrowserRootView() const;
// FullScreenExitBubble overrides:
- virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
- virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
+ virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+ virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
virtual gfx::Rect GetPopupRect(bool ignore_animation_state) const OVERRIDE;
virtual gfx::Point GetCursorScreenPoint() OVERRIDE;
virtual bool WindowContainsPoint(gfx::Point pos) OVERRIDE;
@@ -88,7 +88,7 @@ class FullscreenExitBubbleViews : public FullscreenExitBubble,
views::Widget* popup_;
// Animation controlling showing/hiding of the exit bubble.
- scoped_ptr<ui::SlideAnimation> animation_;
+ scoped_ptr<gfx::SlideAnimation> animation_;
// Attribute animated by |animation_|.
AnimatedAttribute animated_attribute_;

Powered by Google App Engine
This is Rietveld 408576698