OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/string16.h" | 10 #include "base/string16.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "components/zip/zip_internal.h" | |
13 #include "components/zip/zip_reader.h" | |
14 #include "net/base/file_stream.h" | 12 #include "net/base/file_stream.h" |
| 13 #include "third_party/zlib/google/zip_internal.h" |
| 14 #include "third_party/zlib/google/zip_reader.h" |
15 | 15 |
16 #if defined(USE_SYSTEM_MINIZIP) | 16 #if defined(USE_SYSTEM_MINIZIP) |
17 #include <minizip/unzip.h> | 17 #include <minizip/unzip.h> |
18 #include <minizip/zip.h> | 18 #include <minizip/zip.h> |
19 #else | 19 #else |
20 #include "third_party/zlib/contrib/minizip/unzip.h" | 20 #include "third_party/zlib/contrib/minizip/unzip.h" |
21 #include "third_party/zlib/contrib/minizip/zip.h" | 21 #include "third_party/zlib/contrib/minizip/zip.h" |
22 #endif | 22 #endif |
23 | 23 |
24 namespace { | 24 namespace { |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 if (ZIP_OK != zipClose(zip_file, NULL)) { | 198 if (ZIP_OK != zipClose(zip_file, NULL)) { |
199 DLOG(ERROR) << "Error closing zip file for fd " << dest_fd; | 199 DLOG(ERROR) << "Error closing zip file for fd " << dest_fd; |
200 success = false; | 200 success = false; |
201 } | 201 } |
202 | 202 |
203 return success; | 203 return success; |
204 } | 204 } |
205 #endif // defined(OS_POSIX) | 205 #endif // defined(OS_POSIX) |
206 | 206 |
207 } // namespace zip | 207 } // namespace zip |
OLD | NEW |