| Index: content/browser/web_contents/aura/gesture_nav_simple.cc
|
| diff --git a/content/browser/web_contents/aura/gesture_nav_simple.cc b/content/browser/web_contents/aura/gesture_nav_simple.cc
|
| index 681c5ae67e5f362a6484d74c97de2448ee061156..a6aca8c963cdcf3d8db1b39b0ebe052df519ecfd 100644
|
| --- a/content/browser/web_contents/aura/gesture_nav_simple.cc
|
| +++ b/content/browser/web_contents/aura/gesture_nav_simple.cc
|
| @@ -56,7 +56,7 @@ class DeleteAfterAnimation : public ui::ImplicitAnimationObserver {
|
| virtual ~DeleteAfterAnimation() {}
|
|
|
| // ui::ImplicitAnimationObserver:
|
| - virtual void OnImplicitAnimationsCompleted() OVERRIDE {
|
| + virtual void OnImplicitAnimationsCompleted() override {
|
| // Deleting an observer when a ScopedLayerAnimationSettings is iterating
|
| // over them can cause a crash (which can happen during tests). So instead,
|
| // schedule this observer to be deleted soon.
|
| @@ -84,7 +84,7 @@ class ArrowLayerDelegate : public ui::LayerDelegate {
|
|
|
| private:
|
| // ui::LayerDelegate:
|
| - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
|
| + virtual void OnPaintLayer(gfx::Canvas* canvas) override {
|
| SkPaint paint;
|
| paint.setColor(SkColorSetARGB(0xa0, 0, 0, 0));
|
| paint.setStyle(SkPaint::kFill_Style);
|
| @@ -100,11 +100,11 @@ class ArrowLayerDelegate : public ui::LayerDelegate {
|
| }
|
|
|
| virtual void OnDelegatedFrameDamage(
|
| - const gfx::Rect& damage_rect_in_dip) OVERRIDE {}
|
| + const gfx::Rect& damage_rect_in_dip) override {}
|
|
|
| - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {}
|
| + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
|
|
|
| - virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE {
|
| + virtual base::Closure PrepareForLayerBoundsChange() override {
|
| return base::Closure();
|
| }
|
|
|
|
|