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

Unified Diff: chrome/browser/ui/views/page_info_bubble_view.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/page_info_bubble_view.h
===================================================================
--- chrome/browser/ui/views/page_info_bubble_view.h (revision 70685)
+++ chrome/browser/ui/views/page_info_bubble_view.h (working copy)
@@ -6,10 +6,10 @@
#define CHROME_BROWSER_UI_VIEWS_PAGE_INFO_BUBBLE_VIEW_H_
#pragma once
-#include "app/animation_delegate.h"
-#include "app/slide_animation.h"
#include "chrome/browser/page_info_model.h"
#include "chrome/browser/views/info_bubble.h"
+#include "ui/base/animation/animation_delegate.h"
+#include "ui/base/animation/slide_animation.h"
#include "views/controls/link.h"
#include "views/view.h"
@@ -21,7 +21,7 @@
public PageInfoModel::PageInfoModelObserver,
public InfoBubbleDelegate,
public views::LinkController,
- public AnimationDelegate {
+ public ui::AnimationDelegate {
public:
PageInfoBubbleView(gfx::NativeWindow parent_window,
Profile* profile,
@@ -51,9 +51,9 @@
// LinkController methods:
virtual void LinkActivated(views::Link* source, int event_flags);
- // Overridden from AnimationDelegate.
- virtual void AnimationEnded(const Animation* animation);
- virtual void AnimationProgressed(const Animation* animation);
+ // Overridden from ui::AnimationDelegate.
+ virtual void AnimationEnded(const ui::Animation* animation);
+ virtual void AnimationProgressed(const ui::Animation* animation);
private:
// Layout the sections within the bubble.
@@ -74,7 +74,7 @@
views::Link* help_center_link_;
// Animation that helps us change size smoothly as more data comes in.
- SlideAnimation resize_animation_;
+ ui::SlideAnimation resize_animation_;
// The height of the info bubble at the start of the resize animation.
int animation_start_height_;
« no previous file with comments | « chrome/browser/ui/views/notifications/balloon_view.cc ('k') | chrome/browser/ui/views/page_info_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698