diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 22:42:25 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 22:42:25 +0000 |
| commit | 056a8485be5325304fc2c28ab0cecca98e19d687 (patch) | |
| tree | 7cf3bb053f2f4fbd285b26d4c8dc578d0939a0f0 /ui/gfx/codec | |
| parent | a849323e1e44905e48c646b29872995209a9e08a (diff) | |
| download | chromium_src-056a8485be5325304fc2c28ab0cecca98e19d687.zip chromium_src-056a8485be5325304fc2c28ab0cecca98e19d687.tar.gz chromium_src-056a8485be5325304fc2c28ab0cecca98e19d687.tar.bz2 | |
Use generated shim headers for zlib.
BUG=165264
Review URL: https://codereview.chromium.org/11632002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/codec')
| -rw-r--r-- | ui/gfx/codec/png_codec.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ui/gfx/codec/png_codec.cc b/ui/gfx/codec/png_codec.cc index e0dc4c6..4ac54c5 100644 --- a/ui/gfx/codec/png_codec.cc +++ b/ui/gfx/codec/png_codec.cc @@ -9,19 +9,11 @@ #include "base/string_util.h" #include "ui/gfx/size.h" #include "ui/gfx/skia_util.h" +#include "third_party/libpng/png.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkUnPreMultiply.h" #include "third_party/skia/include/core/SkColorPriv.h" - -extern "C" { -#include "third_party/libpng/png.h" - -#if defined(USE_SYSTEM_ZLIB) -#include <zlib.h> -#else #include "third_party/zlib/zlib.h" -#endif -} namespace gfx { |