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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/zip.cc

Issue 11214002: Linux: add an option to use system minizip. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: style nit Created 8 years, 2 months 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
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/common/zip_internal.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/zip.cc
diff --git a/chrome/common/zip.cc b/chrome/common/zip.cc
index 18a845a8cc50b0a978cbae0397fbd706416c7d04..9ec489459cd320345633eae4d9d4fe13b8a12439 100644
--- a/chrome/common/zip.cc
+++ b/chrome/common/zip.cc
@@ -12,8 +12,14 @@
#include "chrome/common/zip_internal.h"
#include "chrome/common/zip_reader.h"
#include "net/base/file_stream.h"
+
+#if defined(USE_SYSTEM_MINIZIP)
+#include <minizip/unzip.h>
+#include <minizip/zip.h>
+#else
#include "third_party/zlib/contrib/minizip/unzip.h"
#include "third_party/zlib/contrib/minizip/zip.h"
+#endif
namespace {
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/common/zip_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698