Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 14 insertions, 0 deletions

diff --git a/chromium/ui/views/border.cc b/chromium/ui/views/border.cc
index 5de602fd50b..f347c2a8369 100644
--- a/chromium/ui/views/border.cc
+++ b/chromium/ui/views/border.cc
@@ -8,6 +8,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/painter.h"
+#include "ui/views/view.h"
 
 namespace views {
 
@@ -21,6 +22,7 @@ class SidedSolidBorder : public Border {
   // Overridden from Border:
   virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE;
   virtual gfx::Insets GetInsets() const OVERRIDE;
+  virtual gfx::Size GetMinimumSize() const OVERRIDE;
 
  private:
   const SkColor color_;
@@ -55,6 +57,10 @@ gfx::Insets SidedSolidBorder::GetInsets() const {
   return insets_;
 }
 
+gfx::Size SidedSolidBorder::GetMinimumSize() const {
+  return gfx::Size(insets_.width(), insets_.height());
+}
+
 // A variation of SidedSolidBorder, where each side has the same thickness.
 class SolidBorder : public SidedSolidBorder {
  public:
@@ -78,6 +84,10 @@ class EmptyBorder : public Border {
     return insets_;
   }
 
+  virtual gfx::Size GetMinimumSize() const OVERRIDE {
+    return gfx::Size();
+  }
+
  private:
   const gfx::Insets insets_;
 
@@ -103,6 +113,10 @@ class BorderPainter : public Border {
     return insets_;
   }
 
+  virtual gfx::Size GetMinimumSize() const OVERRIDE {
+    return painter_->GetMinimumSize();
+  }
+
  private:
   scoped_ptr<Painter> painter_;
   const gfx::Insets insets_;