| Index: cc/layers/ui_resource_layer_impl.h
|
| diff --git a/cc/layers/ui_resource_layer_impl.h b/cc/layers/ui_resource_layer_impl.h
|
| index 2bdf81828213a7c02921fe8a0876ced38d8e2274..f214546ca1db6a9686e4026b4eea68bc8ad51765 100644
|
| --- a/cc/layers/ui_resource_layer_impl.h
|
| +++ b/cc/layers/ui_resource_layer_impl.h
|
| @@ -40,16 +40,16 @@ class CC_EXPORT UIResourceLayerImpl : public LayerImpl {
|
| void SetVertexOpacity(const float vertex_opacity[4]);
|
|
|
| virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
|
| - OVERRIDE;
|
| - virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
|
| + override;
|
| + virtual void PushPropertiesTo(LayerImpl* layer) override;
|
|
|
| virtual bool WillDraw(DrawMode draw_mode,
|
| - ResourceProvider* resource_provider) OVERRIDE;
|
| + ResourceProvider* resource_provider) override;
|
| virtual void AppendQuads(RenderPass* render_pass,
|
| const OcclusionTracker<LayerImpl>& occlusion_tracker,
|
| - AppendQuadsData* append_quads_data) OVERRIDE;
|
| + AppendQuadsData* append_quads_data) override;
|
|
|
| - virtual base::DictionaryValue* LayerTreeAsJson() const OVERRIDE;
|
| + virtual base::DictionaryValue* LayerTreeAsJson() const override;
|
|
|
| protected:
|
| UIResourceLayerImpl(LayerTreeImpl* tree_impl, int id);
|
| @@ -64,7 +64,7 @@ class CC_EXPORT UIResourceLayerImpl : public LayerImpl {
|
| float vertex_opacity_[4];
|
|
|
| private:
|
| - virtual const char* LayerTypeAsString() const OVERRIDE;
|
| + virtual const char* LayerTypeAsString() const override;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(UIResourceLayerImpl);
|
| };
|
|
|