| Index: cc/layers/painted_scrollbar_layer_impl.h
|
| diff --git a/cc/layers/painted_scrollbar_layer_impl.h b/cc/layers/painted_scrollbar_layer_impl.h
|
| index 1c67e734e3598255f5077ed4f3196220760bd52e..d54de6b38ac846038ca24eb824de9bae7f965689 100644
|
| --- a/cc/layers/painted_scrollbar_layer_impl.h
|
| +++ b/cc/layers/painted_scrollbar_layer_impl.h
|
| @@ -21,18 +21,17 @@ class CC_EXPORT PaintedScrollbarLayerImpl : public ScrollbarLayerImplBase {
|
| LayerTreeImpl* tree_impl,
|
| int id,
|
| ScrollbarOrientation orientation);
|
| - virtual ~PaintedScrollbarLayerImpl();
|
| + ~PaintedScrollbarLayerImpl() override;
|
|
|
| // LayerImpl implementation.
|
| - virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
|
| - override;
|
| - virtual void PushPropertiesTo(LayerImpl* layer) override;
|
| + scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
|
| + void PushPropertiesTo(LayerImpl* layer) override;
|
|
|
| - virtual bool WillDraw(DrawMode draw_mode,
|
| - ResourceProvider* resource_provider) override;
|
| - virtual void AppendQuads(RenderPass* render_pass,
|
| - const Occlusion& occlusion_in_content_space,
|
| - AppendQuadsData* append_quads_data) override;
|
| + bool WillDraw(DrawMode draw_mode,
|
| + ResourceProvider* resource_provider) override;
|
| + void AppendQuads(RenderPass* render_pass,
|
| + const Occlusion& occlusion_in_content_space,
|
| + AppendQuadsData* append_quads_data) override;
|
|
|
| void SetThumbThickness(int thumb_thickness);
|
| void SetThumbLength(int thumb_length);
|
| @@ -52,14 +51,14 @@ class CC_EXPORT PaintedScrollbarLayerImpl : public ScrollbarLayerImplBase {
|
| ScrollbarOrientation orientation);
|
|
|
| // ScrollbarLayerImplBase implementation.
|
| - virtual int ThumbThickness() const override;
|
| - virtual int ThumbLength() const override;
|
| - virtual float TrackLength() const override;
|
| - virtual int TrackStart() const override;
|
| - virtual bool IsThumbResizable() const override;
|
| + int ThumbThickness() const override;
|
| + int ThumbLength() const override;
|
| + float TrackLength() const override;
|
| + int TrackStart() const override;
|
| + bool IsThumbResizable() const override;
|
|
|
| private:
|
| - virtual const char* LayerTypeAsString() const override;
|
| + const char* LayerTypeAsString() const override;
|
|
|
| UIResourceId track_ui_resource_id_;
|
| UIResourceId thumb_ui_resource_id_;
|
|
|