BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.

Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/chromium/ui/wm/core/image_grid.h b/chromium/ui/wm/core/image_grid.h
index 987ee26c726..b3cf2e1cf71 100644
--- a/chromium/ui/wm/core/image_grid.h
+++ b/chromium/ui/wm/core/image_grid.h
@@ -130,16 +130,17 @@ class WM_EXPORT ImageGrid {
   class ImagePainter : public ui::LayerDelegate {
    public:
     ImagePainter(const gfx::ImageSkia& image) : image_(image) {}
-    virtual ~ImagePainter() {}
+    ~ImagePainter() override {}
 
     // Clips |layer| to |clip_rect|.  Triggers a repaint if the clipping
     // rectangle has changed.  An empty rectangle disables clipping.
     void SetClipRect(const gfx::Rect& clip_rect, ui::Layer* layer);
 
     // ui::LayerDelegate implementation:
-    virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE;
-    virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
-    virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE;
+    void OnPaintLayer(gfx::Canvas* canvas) override;
+    void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override;
+    void OnDeviceScaleFactorChanged(float device_scale_factor) override;
+    base::Closure PrepareForLayerBoundsChange() override;
 
    private:
     friend class TestAPI;