Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / compositor / scoped_layer_animation_settings.cc

diff --git a/src/ui/compositor/scoped_layer_animation_settings.cc b/src/ui/compositor/scoped_layer_animation_settings.cc
index 487f96a..7a593ca 100644 (file)
--- a/src/ui/compositor/scoped_layer_animation_settings.cc
+++ b/src/ui/compositor/scoped_layer_animation_settings.cc
@@ -24,7 +24,7 @@ class InvertingObserver : public ImplicitAnimationObserver {
       : base_layer_(NULL) {
     }
 
-    virtual ~InvertingObserver() {}
+    ~InvertingObserver() override {}
 
     void SetLayer(Layer* base_layer) { base_layer_ = base_layer; }
 
@@ -34,10 +34,9 @@ class InvertingObserver : public ImplicitAnimationObserver {
       inverse_layers_.push_back(inverse_layer);
     }
 
-    virtual void OnImplicitAnimationsCompleted() OVERRIDE {}
+    void OnImplicitAnimationsCompleted() override {}
 
-    virtual void OnLayerAnimationScheduled(
-        LayerAnimationSequence* sequence) OVERRIDE {
+    void OnLayerAnimationScheduled(LayerAnimationSequence* sequence) override {
       DCHECK(base_layer_  != NULL)
         << "Must set base layer with ScopedLayerAnimationSettings::"
         << "SetInverslyAnimatedBaseLayer";