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

Unified Diff: ash/wm/workspace/workspace_window_resizer_unittest.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 | « ash/wm/workspace/phantom_window_controller.cc ('k') | ash/wm/workspace_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_window_resizer_unittest.cc
diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc
index 62eb38098aac9f56acf7113dfcfbb1762a174a01..5f096d070c80d74154eda507a71c3c2de54dbf1a 100644
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -31,9 +31,10 @@
#include "ui/gfx/screen.h"
#include "ui/views/widget/widget.h"
-namespace ui {
+namespace gfx {
// Class to provide access to SlideAnimation internals for testing.
+// TODO: this should be next to SlideAnimation, not here.
class SlideAnimation::TestApi {
public:
explicit TestApi(SlideAnimation* animation) : animation_(animation) {}
@@ -202,8 +203,8 @@ class WorkspaceWindowResizerTest : public test::AshTestBase {
}
// Simulate running the animation.
- void RunAnimationTillComplete(ui::SlideAnimation* animation) {
- ui::SlideAnimation::TestApi test_api(animation);
+ void RunAnimationTillComplete(gfx::SlideAnimation* animation) {
+ gfx::SlideAnimation::TestApi test_api(animation);
test_api.RunTillComplete();
}
« no previous file with comments | « ash/wm/workspace/phantom_window_controller.cc ('k') | ash/wm/workspace_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698