Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(964)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/codec/png_codec.cc

Issue 11632002: Use generated shim headers for zlib. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« build/shim_headers.gypi ('K') | « third_party/zlib/zlib.gyp ('k') | webkit/support/webkit_support_gfx.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/codec/png_codec.cc
diff --git a/ui/gfx/codec/png_codec.cc b/ui/gfx/codec/png_codec.cc
index e0dc4c6d5a336f06a73938191bde3824f6802250..4ac54c5a6fff597c821e880ee1669b4de0edfe4f 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 {
« build/shim_headers.gypi ('K') | « third_party/zlib/zlib.gyp ('k') | webkit/support/webkit_support_gfx.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698