| Index: cc/layers/ui_resource_layer.h
|
| diff --git a/cc/layers/ui_resource_layer.h b/cc/layers/ui_resource_layer.h
|
| index 8e278a97bc601f1b8ef5c9795ca3966812a4c658..f79389ba5ea17cbb46da5d9d54a7c5c0b61ce393 100644
|
| --- a/cc/layers/ui_resource_layer.h
|
| +++ b/cc/layers/ui_resource_layer.h
|
| @@ -20,9 +20,9 @@ class CC_EXPORT UIResourceLayer : public Layer {
|
| public:
|
| static scoped_refptr<UIResourceLayer> Create();
|
|
|
| - virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
|
| + virtual void PushPropertiesTo(LayerImpl* layer) override;
|
|
|
| - virtual void SetLayerTreeHost(LayerTreeHost* host) OVERRIDE;
|
| + virtual void SetLayerTreeHost(LayerTreeHost* host) override;
|
|
|
| void SetBitmap(const SkBitmap& skbitmap);
|
|
|
| @@ -49,7 +49,7 @@ class CC_EXPORT UIResourceLayer : public Layer {
|
| UIResourceLayer();
|
| virtual ~UIResourceLayer();
|
|
|
| - virtual bool HasDrawableContent() const OVERRIDE;
|
| + virtual bool HasDrawableContent() const override;
|
|
|
| scoped_ptr<UIResourceHolder> ui_resource_holder_;
|
| SkBitmap bitmap_;
|
| @@ -60,7 +60,7 @@ class CC_EXPORT UIResourceLayer : public Layer {
|
|
|
| private:
|
| virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
|
| - OVERRIDE;
|
| + override;
|
| void RecreateUIResourceHolder();
|
|
|
|
|
|
|