| Index: content/browser/android/edge_effect.h
|
| diff --git a/content/browser/android/edge_effect.h b/content/browser/android/edge_effect.h
|
| index 7b0e2e426ffe37fad24852b3ee54b209546a4daa..888c28e764252f0ab416148f725efe3becf78d87 100644
|
| --- a/content/browser/android/edge_effect.h
|
| +++ b/content/browser/android/edge_effect.h
|
| @@ -26,21 +26,21 @@ class EdgeEffect : public EdgeEffectBase {
|
| public:
|
| explicit EdgeEffect(ui::ResourceManager* resource_manager,
|
| float device_scale_factor);
|
| - virtual ~EdgeEffect();
|
| + ~EdgeEffect() override;
|
|
|
| - virtual void Pull(base::TimeTicks current_time,
|
| - float delta_distance,
|
| - float displacement) override;
|
| - virtual void Absorb(base::TimeTicks current_time, float velocity) override;
|
| - virtual bool Update(base::TimeTicks current_time) override;
|
| - virtual void Release(base::TimeTicks current_time) override;
|
| + void Pull(base::TimeTicks current_time,
|
| + float delta_distance,
|
| + float displacement) override;
|
| + void Absorb(base::TimeTicks current_time, float velocity) override;
|
| + bool Update(base::TimeTicks current_time) override;
|
| + void Release(base::TimeTicks current_time) override;
|
|
|
| - virtual void Finish() override;
|
| - virtual bool IsFinished() const override;
|
| + void Finish() override;
|
| + bool IsFinished() const override;
|
|
|
| - virtual void ApplyToLayers(const gfx::SizeF& size,
|
| - const gfx::Transform& transform) override;
|
| - virtual void SetParent(cc::Layer* parent) override;
|
| + void ApplyToLayers(const gfx::SizeF& size,
|
| + const gfx::Transform& transform) override;
|
| + void SetParent(cc::Layer* parent) override;
|
|
|
| // Thread-safe trigger to load resources.
|
| static void PreloadResources(ui::ResourceManager* resource_manager);
|
|
|