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

Unified Diff: content/browser/android/edge_effect.h

Issue 629183002: Replacing the OVERRIDE with override and FINAL with final in content/browser/android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolving Error in android Created 6 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
« no previous file with comments | « content/browser/android/download_controller_android_impl.h ('k') | content/browser/android/edge_effect_l.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/edge_effect.h
diff --git a/content/browser/android/edge_effect.h b/content/browser/android/edge_effect.h
index ced6a3245761a490ece07c57ec4b52fed4220382..8fb5c5f55d35e94210f08b1e965f24fe60507a5d 100644
--- a/content/browser/android/edge_effect.h
+++ b/content/browser/android/edge_effect.h
@@ -30,17 +30,17 @@ class EdgeEffect : public EdgeEffectBase {
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;
+ 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;
- virtual void Finish() OVERRIDE;
- virtual bool IsFinished() const OVERRIDE;
+ virtual void Finish() override;
+ virtual bool IsFinished() const override;
virtual void ApplyToLayers(const gfx::SizeF& size,
- const gfx::Transform& transform) OVERRIDE;
- virtual void SetParent(cc::Layer* parent) OVERRIDE;
+ const gfx::Transform& transform) override;
+ virtual void SetParent(cc::Layer* parent) override;
// Thread-safe trigger to load resources.
static void PreloadResources(ui::SystemUIResourceManager* resource_manager);
« no previous file with comments | « content/browser/android/download_controller_android_impl.h ('k') | content/browser/android/edge_effect_l.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698