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

Unified Diff: chrome/browser/ui/views/frame/contents_container.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
« no previous file with comments | « chrome/browser/ui/views/dropdown_bar_host.cc ('k') | chrome/browser/ui/views/frame/contents_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/contents_container.h
===================================================================
--- chrome/browser/ui/views/frame/contents_container.h (revision 70685)
+++ chrome/browser/ui/views/frame/contents_container.h (working copy)
@@ -6,13 +6,16 @@
#define CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_CONTAINER_H_
#pragma once
-#include "app/animation_delegate.h"
#include "base/scoped_ptr.h"
+#include "ui/base/animation/animation_delegate.h"
#include "views/view.h"
-class SlideAnimation;
class TabContents;
+namespace ui {
+class SlideAnimation;
+}
+
namespace views {
class Widget;
}
@@ -20,7 +23,7 @@
// ContentsContainer is responsible for managing the TabContents views.
// ContentsContainer has up to two children: one for the currently active
// TabContents and one for instant's TabContents.
-class ContentsContainer : public views::View, public AnimationDelegate {
+class ContentsContainer : public views::View, public ui::AnimationDelegate {
public:
explicit ContentsContainer(views::View* active);
virtual ~ContentsContainer();
@@ -54,8 +57,8 @@
// View overrides:
virtual void Layout();
- // AnimationDelegate overrides:
- virtual void AnimationProgressed(const Animation* animation);
+ // ui::AnimationDelegate overrides:
+ virtual void AnimationProgressed(const ui::Animation* animation);
private:
class OverlayContentView;
@@ -80,7 +83,7 @@
OverlayContentView* overlay_view_;
// Animation used to vary the opacity of active_overlay.
- scoped_ptr<SlideAnimation> overlay_animation_;
+ scoped_ptr<ui::SlideAnimation> overlay_animation_;
// The margin between the top and the active view. This is used to make the
// preview overlap the bookmark bar on the new tab page.
« no previous file with comments | « chrome/browser/ui/views/dropdown_bar_host.cc ('k') | chrome/browser/ui/views/frame/contents_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698