third_party/zlib/google/zip.cc - Issue 14021015: Move components/zip to third_party/zip

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/zlib/google/zip.cc

Issue 14021015: Move components/zip to third_party/zip (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update unit_tests.isolate for new test data location Created 7 years, 7 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 unified diff | Download patch | Annotate | Revision Log

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

« no previous file with comments | « third_party/zlib/google/zip.h ('k') | third_party/zlib/google/zip_internal.h » ('j') | no next file with comments »