Chromium Code Reviews| Index: ui/gfx/size_base_impl.h |
| diff --git a/ui/gfx/size_base_impl.h b/ui/gfx/size_base_impl.h |
| index 99b11458f4adf341f0fc44c5c80c7f6253e7c331..d63dc7fa83873336b7b1a310f66993457b92c2e5 100644 |
| --- a/ui/gfx/size_base_impl.h |
| +++ b/ui/gfx/size_base_impl.h |
| @@ -16,18 +16,14 @@ namespace gfx { |
| template<typename Class, typename Type> |
| void SizeBase<Class, Type>::set_width(Type width) { |
| -#if !defined(OS_ANDROID) |
| // TODO(aelias): Remove these ifdefs for Android. See http://crbug.com/168927 |
|
piman
2013/01/10 17:52:06
nit: remove TODO
Jerome
2013/01/10 19:21:55
Done.
|
| DCHECK(!(width < 0)); |
| -#endif |
| width_ = width < 0 ? 0 : width; |
| } |
| template<typename Class, typename Type> |
| void SizeBase<Class, Type>::set_height(Type height) { |
| -#if !defined(OS_ANDROID) |
| DCHECK(!(height < 0)); |
| -#endif |
| height_ = height < 0 ? 0 : height; |
| } |
| @@ -35,10 +31,8 @@ template<typename Class, typename Type> |
| SizeBase<Class, Type>::SizeBase(Type width, Type height) |
| : width_(width < 0 ? 0 : width), |
| height_(height < 0 ? 0 : height) { |
| -#if !defined(OS_ANDROID) |
| DCHECK(!(width < 0)); |
| DCHECK(!(height < 0)); |
| -#endif |
| } |
| } // namespace gfx |