| OLD | NEW |
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/zip/zip.h" | 5 #include "third_party/zlib/google/zip.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| 11 | 11 |
| 12 #if defined(USE_SYSTEM_MINIZIP) | 12 #if defined(USE_SYSTEM_MINIZIP) |
| 13 #include <minizip/ioapi.h> | 13 #include <minizip/ioapi.h> |
| 14 #include <minizip/unzip.h> | 14 #include <minizip/unzip.h> |
| 15 #include <minizip/zip.h> | 15 #include <minizip/zip.h> |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 zipFile OpenFdForZipping(int zip_fd, int append_flag) { | 307 zipFile OpenFdForZipping(int zip_fd, int append_flag) { |
| 308 zlib_filefunc_def zip_funcs; | 308 zlib_filefunc_def zip_funcs; |
| 309 FillFdOpenFileFunc(&zip_funcs, zip_fd); | 309 FillFdOpenFileFunc(&zip_funcs, zip_fd); |
| 310 // Passing dummy "fd" filename to zlib. | 310 // Passing dummy "fd" filename to zlib. |
| 311 return zipOpen2("fd", append_flag, NULL, &zip_funcs); | 311 return zipOpen2("fd", append_flag, NULL, &zip_funcs); |
| 312 } | 312 } |
| 313 #endif | 313 #endif |
| 314 | 314 |
| 315 } // namespace internal | 315 } // namespace internal |
| 316 } // namespace zip | 316 } // namespace zip |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 14021015:
Move components/zip to third_party/zip (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src