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

Unified Diff: ui/base/animation/multi_animation.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 | « ui/base/animation/linear_animation.cc ('k') | ui/base/animation/multi_animation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/animation/multi_animation.h
===================================================================
--- ui/base/animation/multi_animation.h (revision 0)
+++ ui/base/animation/multi_animation.h (working copy)
@@ -1,16 +1,18 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef APP_MULTI_ANIMATION_H_
-#define APP_MULTI_ANIMATION_H_
+#ifndef UI_BASE_ANIMATION_MULTI_ANIMATION_H_
+#define UI_BASE_ANIMATION_MULTI_ANIMATION_H_
#pragma once
#include <vector>
-#include "app/animation.h"
-#include "app/tween.h"
+#include "ui/base/animation/animation.h"
+#include "ui/base/animation/tween.h"
+namespace ui {
+
// MultiAnimation is an animation that consists of a number of sub animations.
// To create a MultiAnimation pass in the parts, invoke Start() and the delegate
// is notified as the animation progresses. By default MultiAnimation runs until
@@ -87,4 +89,6 @@
DISALLOW_COPY_AND_ASSIGN(MultiAnimation);
};
-#endif // APP_MULTI_ANIMATION_H_
+} // namespace ui
+
+#endif // UI_BASE_ANIMATION_MULTI_ANIMATION_H_
« no previous file with comments | « ui/base/animation/linear_animation.cc ('k') | ui/base/animation/multi_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698