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

Unified Diff: cc/layers/image_layer.h

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « cc/layers/heads_up_display_unittest.cc ('k') | cc/layers/io_surface_layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/image_layer.h
diff --git a/cc/layers/image_layer.h b/cc/layers/image_layer.h
index 63d467ae2e8c74f7ccf738f43335f84477bc0e81..53d1f692f1a6002825466af39fee2ba0c19ee6a0 100644
--- a/cc/layers/image_layer.h
+++ b/cc/layers/image_layer.h
@@ -20,27 +20,27 @@ class CC_EXPORT ImageLayer : public TiledLayer {
// Layer implementation.
virtual void SetTexturePriorities(const PriorityCalculator& priority_calc)
- OVERRIDE;
+ override;
virtual bool Update(ResourceUpdateQueue* queue,
- const OcclusionTracker<Layer>* occlusion) OVERRIDE;
+ const OcclusionTracker<Layer>* occlusion) override;
virtual void CalculateContentsScale(float ideal_contents_scale,
float* contents_scale_x,
float* contents_scale_y,
- gfx::Size* content_bounds) OVERRIDE;
- virtual void OnOutputSurfaceCreated() OVERRIDE;
+ gfx::Size* content_bounds) override;
+ virtual void OnOutputSurfaceCreated() override;
void SetBitmap(const SkBitmap& image);
protected:
- virtual bool HasDrawableContent() const OVERRIDE;
+ virtual bool HasDrawableContent() const override;
private:
ImageLayer();
virtual ~ImageLayer();
// TiledLayer Implementation.
- virtual LayerUpdater* Updater() const OVERRIDE;
- virtual void CreateUpdaterIfNeeded() OVERRIDE;
+ virtual LayerUpdater* Updater() const override;
+ virtual void CreateUpdaterIfNeeded() override;
float ImageContentsScaleX() const;
float ImageContentsScaleY() const;
« no previous file with comments | « cc/layers/heads_up_display_unittest.cc ('k') | cc/layers/io_surface_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698