diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:22:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-09 15:11:45 +0000 |
| commit | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch) | |
| tree | e75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/gin/wrappable.h | |
| parent | a4f3d46271c57e8155ba912df46a05559d14726e (diff) | |
| download | qtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz | |
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion.
Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/gin/wrappable.h')
| -rw-r--r-- | chromium/gin/wrappable.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chromium/gin/wrappable.h b/chromium/gin/wrappable.h index f253fd9566e..73c089a3061 100644 --- a/chromium/gin/wrappable.h +++ b/chromium/gin/wrappable.h @@ -8,7 +8,6 @@ #include <type_traits> #include "base/macros.h" -#include "base/template_util.h" #include "gin/converter.h" #include "gin/gin_export.h" #include "gin/public/wrapper_info.h" @@ -107,7 +106,7 @@ class Wrappable : public WrappableBase { template <typename T> struct Converter<T*, typename std::enable_if< - base::is_convertible<T*, WrappableBase*>::value>::type> { + std::is_convertible<T*, WrappableBase*>::value>::type> { static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, T* val) { return val->GetWrapper(isolate); } |