Commit 3a6c6372 authored by Nico Weber's avatar Nico Weber

Remove the last superfluous semicolons in ui/.

Bug: 926235
Change-Id: Ib0d2ad966a4e28f5b6290f1b636dfcc53c4d3b55
Reviewed-on: https://chromium-review.googlesource.com/c/1479835
Commit-Queue: Nico Weber <thakis@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarHans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#634181}
parent 27499a41
...@@ -57,7 +57,7 @@ struct _AtkUtilAuraLinuxClass ...@@ -57,7 +57,7 @@ struct _AtkUtilAuraLinuxClass
GType atk_util_auralinux_get_type(); GType atk_util_auralinux_get_type();
G_DEFINE_TYPE(AtkUtilAuraLinux, atk_util_auralinux, ATK_TYPE_UTIL); G_DEFINE_TYPE(AtkUtilAuraLinux, atk_util_auralinux, ATK_TYPE_UTIL)
static void atk_util_auralinux_init(AtkUtilAuraLinux *ax_util) { static void atk_util_auralinux_init(AtkUtilAuraLinux *ax_util) {
} }
......
...@@ -46,7 +46,7 @@ DEFINE_UI_CLASS_PROPERTY_KEY(int64_t, kTestPropertyKey9, 777) ...@@ -46,7 +46,7 @@ DEFINE_UI_CLASS_PROPERTY_KEY(int64_t, kTestPropertyKey9, 777)
DEFINE_UI_CLASS_PROPERTY_KEY(base::TimeDelta, DEFINE_UI_CLASS_PROPERTY_KEY(base::TimeDelta,
kTestTimeDeltaKey, kTestTimeDeltaKey,
base::TimeDelta()); base::TimeDelta())
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia,
kTestImageSkiaPropertyKey, kTestImageSkiaPropertyKey,
......
...@@ -109,14 +109,19 @@ LayerAnimator* LayerAnimator::CreateImplicitAnimator() { ...@@ -109,14 +109,19 @@ LayerAnimator* LayerAnimator::CreateImplicitAnimator() {
return target.member; \ return target.member; \
} }
ANIMATED_PROPERTY( ANIMATED_PROPERTY(const gfx::Transform&,
const gfx::Transform&, TRANSFORM, Transform, gfx::Transform, transform); TRANSFORM,
ANIMATED_PROPERTY(const gfx::Rect&, BOUNDS, Bounds, gfx::Rect, bounds); Transform,
ANIMATED_PROPERTY(float, OPACITY, Opacity, float, opacity); gfx::Transform,
ANIMATED_PROPERTY(bool, VISIBILITY, Visibility, bool, visibility); transform)
ANIMATED_PROPERTY(float, BRIGHTNESS, Brightness, float, brightness); ANIMATED_PROPERTY(const gfx::Rect&, BOUNDS, Bounds, gfx::Rect, bounds)
ANIMATED_PROPERTY(float, GRAYSCALE, Grayscale, float, grayscale); ANIMATED_PROPERTY(float, OPACITY, Opacity, float, opacity)
ANIMATED_PROPERTY(SkColor, COLOR, Color, SkColor, color); ANIMATED_PROPERTY(bool, VISIBILITY, Visibility, bool, visibility)
ANIMATED_PROPERTY(float, BRIGHTNESS, Brightness, float, brightness)
ANIMATED_PROPERTY(float, GRAYSCALE, Grayscale, float, grayscale)
ANIMATED_PROPERTY(SkColor, COLOR, Color, SkColor, color)
#undef ANIMATED_PROPERTY
base::TimeDelta LayerAnimator::GetTransitionDuration() const { base::TimeDelta LayerAnimator::GetTransitionDuration() const {
return transition_duration_; return transition_duration_;
......
...@@ -17,7 +17,7 @@ DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false) ...@@ -17,7 +17,7 @@ DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false)
DEFINE_UI_CLASS_PROPERTY_KEY(base::TimeDelta, DEFINE_UI_CLASS_PROPERTY_KEY(base::TimeDelta,
kWindowVisibilityAnimationDurationKey, kWindowVisibilityAnimationDurationKey,
base::TimeDelta()); base::TimeDelta())
DEFINE_UI_CLASS_PROPERTY_KEY(WindowVisibilityAnimationTransition, DEFINE_UI_CLASS_PROPERTY_KEY(WindowVisibilityAnimationTransition,
kWindowVisibilityAnimationTransitionKey, kWindowVisibilityAnimationTransitionKey,
ANIMATE_BOTH) ANIMATE_BOTH)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment