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

Unified Diff: ui/gfx/animation/multi_animation.cc

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 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/gfx/animation/multi_animation.h ('k') | ui/gfx/animation/multi_animation_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/animation/multi_animation.cc
diff --git a/ui/base/animation/multi_animation.cc b/ui/gfx/animation/multi_animation.cc
similarity index 95%
rename from ui/base/animation/multi_animation.cc
rename to ui/gfx/animation/multi_animation.cc
index 2e9e4772db634bde00d53ae24abec7130ef16acc..4ecc73c805a7059a189ddba4840393c9720c2a4c 100644
--- a/ui/base/animation/multi_animation.cc
+++ b/ui/gfx/animation/multi_animation.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/base/animation/multi_animation.h"
+#include "ui/gfx/animation/multi_animation.h"
#include "base/logging.h"
-#include "ui/base/animation/animation_delegate.h"
+#include "ui/gfx/animation/animation_delegate.h"
-namespace ui {
+namespace gfx {
// Default interval, in ms.
static const int kDefaultTimerInterval = 20;
@@ -91,4 +91,4 @@ const MultiAnimation::Part& MultiAnimation::GetPart(int* time_ms,
return parts_[0];
}
-} // namespace ui
+} // namespace gfx
« no previous file with comments | « ui/gfx/animation/multi_animation.h ('k') | ui/gfx/animation/multi_animation_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698