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

Unified Diff: services/view_manager/animation_runner_unittest.cc

Issue 1375313006: For c++, Generate enum classes instead of enum from mojom. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 2 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
Index: services/view_manager/animation_runner_unittest.cc
diff --git a/services/view_manager/animation_runner_unittest.cc b/services/view_manager/animation_runner_unittest.cc
index 0801501a94be9a856d143619a24eb0ddf46ffe35..26832c5ccf18fdabb09eb611c2e4fa2850994076 100644
--- a/services/view_manager/animation_runner_unittest.cc
+++ b/services/view_manager/animation_runner_unittest.cc
@@ -14,10 +14,6 @@
#include "testing/gtest/include/gtest/gtest.h"
using base::TimeDelta;
-using mojo::ANIMATION_PROPERTY_NONE;
-using mojo::ANIMATION_PROPERTY_OPACITY;
-using mojo::ANIMATION_PROPERTY_TRANSFORM;
-using mojo::ANIMATION_TWEEN_TYPE_LINEAR;
using mojo::AnimationElement;
using mojo::AnimationGroup;
using mojo::AnimationProperty;
@@ -106,7 +102,7 @@ void AddOpacityElement(AnimationGroup* group,
AnimationValuePtr start_value,
AnimationValuePtr target_value) {
AddElement(group, time, start_value.Pass(), target_value.Pass(),
- ANIMATION_PROPERTY_OPACITY, ANIMATION_TWEEN_TYPE_LINEAR);
+ AnimationProperty::OPACITY, AnimationTweenType::LINEAR);
}
void AddTransformElement(AnimationGroup* group,
@@ -114,12 +110,12 @@ void AddTransformElement(AnimationGroup* group,
AnimationValuePtr start_value,
AnimationValuePtr target_value) {
AddElement(group, time, start_value.Pass(), target_value.Pass(),
- ANIMATION_PROPERTY_TRANSFORM, ANIMATION_TWEEN_TYPE_LINEAR);
+ AnimationProperty::TRANSFORM, AnimationTweenType::LINEAR);
}
void AddPauseElement(AnimationGroup* group, TimeDelta time) {
AddElement(group, time, AnimationValuePtr(), AnimationValuePtr(),
- ANIMATION_PROPERTY_NONE, ANIMATION_TWEEN_TYPE_LINEAR);
+ AnimationProperty::NONE, AnimationTweenType::LINEAR);
}
void InitGroupForView(AnimationGroup* group,
@@ -496,7 +492,7 @@ TEST_F(AnimationRunnerTest, RescheduleSetsPropertiesToFinalValue) {
ScheduleForSingleView(&view, &group, initial_time_);
// Schedule() again, this time without animating opacity.
- group.sequences[0]->elements[0]->property = ANIMATION_PROPERTY_NONE;
+ group.sequences[0]->elements[0]->property = AnimationProperty::NONE;
ScheduleForSingleView(&view, &group, initial_time_);
// Opacity should go to final value.
« no previous file with comments | « services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc ('k') | services/view_manager/connection_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698