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_ |