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

Unified Diff: chrome/browser/ui/views/fullscreen_exit_bubble.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/fullscreen_exit_bubble.h
===================================================================
--- chrome/browser/ui/views/fullscreen_exit_bubble.h (revision 70685)
+++ chrome/browser/ui/views/fullscreen_exit_bubble.h (working copy)
@@ -6,26 +6,28 @@
#define CHROME_BROWSER_UI_VIEWS_FULLSCREEN_EXIT_BUBBLE_H__
#pragma once
-#include "app/animation_delegate.h"
#include "base/scoped_ptr.h"
#include "base/timer.h"
#include "chrome/browser/command_updater.h"
+#include "ui/base/animation/animation_delegate.h"
#include "views/controls/link.h"
+namespace ui {
+class SlideAnimation;
+}
+
#if defined(OS_LINUX)
namespace views {
class WidgetGtk;
}
#endif
-class SlideAnimation;
-
// FullscreenExitBubble is responsible for showing a bubble atop the screen in
// fullscreen mode, telling users how to exit and providing a click target.
// The bubble auto-hides, and re-shows when the user moves to the screen top.
class FullscreenExitBubble : public views::LinkController,
- public AnimationDelegate {
+ public ui::AnimationDelegate {
public:
explicit FullscreenExitBubble(
views::Widget* frame,
@@ -48,9 +50,9 @@
// views::LinkController
virtual void LinkActivated(views::Link* source, int event_flags);
- // AnimationDelegate
- virtual void AnimationProgressed(const Animation* animation);
- virtual void AnimationEnded(const Animation* animation);
+ // ui::AnimationDelegate
+ virtual void AnimationProgressed(const ui::Animation* animation);
+ virtual void AnimationEnded(const ui::Animation* animation);
// Called repeatedly to get the current mouse position and animate the bubble
// on or off the screen as appropriate.
@@ -84,7 +86,7 @@
FullscreenExitView* view_;
// Animation controlling sliding into/out of the top of the screen.
- scoped_ptr<SlideAnimation> size_animation_;
+ scoped_ptr<ui::SlideAnimation> size_animation_;
// Timer to delay before allowing the bubble to hide after it's initially
// shown.
« no previous file with comments | « chrome/browser/ui/views/frame/contents_container.cc ('k') | chrome/browser/ui/views/fullscreen_exit_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698