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, 3 insertions, 4 deletions

diff --git a/chromium/ui/views/background.cc b/chromium/ui/views/background.cc
index bb2ddd0928e..0fbd0ecbebe 100644
--- a/chromium/ui/views/background.cc
+++ b/chromium/ui/views/background.cc
@@ -22,7 +22,7 @@ class SolidBackground : public Background {
     SetNativeControlColor(color);
   }
 
-  virtual void Paint(gfx::Canvas* canvas, View* view) const OVERRIDE {
+  void Paint(gfx::Canvas* canvas, View* view) const override {
     // Fill the background. Note that we don't constrain to the bounds as
     // canvas is already clipped for us.
     canvas->DrawColor(get_color());
@@ -39,13 +39,12 @@ class BackgroundPainter : public Background {
     DCHECK(painter);
   }
 
-  virtual ~BackgroundPainter() {
+  ~BackgroundPainter() override {
     if (owns_painter_)
       delete painter_;
   }
 
-
-  virtual void Paint(gfx::Canvas* canvas, View* view) const OVERRIDE {
+  void Paint(gfx::Canvas* canvas, View* view) const override {
     Painter::PaintPainterAt(canvas, painter_, view->GetLocalBounds());
   }