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

Unified Diff: chrome/browser/ui/views/fullscreen_exit_bubble.cc

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
« no previous file with comments | « chrome/browser/ui/views/fullscreen_exit_bubble.h ('k') | chrome/browser/ui/views/info_bubble.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/fullscreen_exit_bubble.cc
===================================================================
--- chrome/browser/ui/views/fullscreen_exit_bubble.cc (revision 70685)
+++ chrome/browser/ui/views/fullscreen_exit_bubble.cc (working copy)
@@ -7,11 +7,11 @@
#include "app/keyboard_codes.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
-#include "app/slide_animation.h"
#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_command_ids.h"
#include "gfx/canvas_skia.h"
#include "grit/generated_resources.h"
+#include "ui/base/animation/slide_animation.h"
#include "views/screen.h"
#include "views/widget/root_view.h"
#include "views/window/window.h"
@@ -143,7 +143,7 @@
: root_view_(frame->GetRootView()),
delegate_(delegate),
popup_(NULL),
- size_animation_(new SlideAnimation(this)) {
+ size_animation_(new ui::SlideAnimation(this)) {
size_animation_->Reset(1);
// Create the contents view.
@@ -198,7 +198,7 @@
}
void FullscreenExitBubble::AnimationProgressed(
- const Animation* animation) {
+ const ui::Animation* animation) {
gfx::Rect popup_rect(GetPopupRect(false));
if (popup_rect.IsEmpty()) {
popup_->Hide();
@@ -213,7 +213,7 @@
}
}
void FullscreenExitBubble::AnimationEnded(
- const Animation* animation) {
+ const ui::Animation* animation) {
AnimationProgressed(animation);
}
« no previous file with comments | « chrome/browser/ui/views/fullscreen_exit_bubble.h ('k') | chrome/browser/ui/views/info_bubble.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698