third_party/zlib/google/zip_reader.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_reader.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_reader.h"	5 #include "third_party/zlib/google/zip_reader.h"

6	6

7 #include "base/file_util.h"	7 #include "base/file_util.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "base/string_util.h"	9 #include "base/string_util.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

11 #include "components/zip/zip_internal.h"

12 #include "net/base/file_stream.h"	11 #include "net/base/file_stream.h"

	12 #include "third_party/zlib/google/zip_internal.h"

13	13

14 #if defined(USE_SYSTEM_MINIZIP)	14 #if defined(USE_SYSTEM_MINIZIP)

15 #include <minizip/unzip.h>	15 #include <minizip/unzip.h>

16 #else	16 #else

17 #include "third_party/zlib/contrib/minizip/unzip.h"	17 #include "third_party/zlib/contrib/minizip/unzip.h"

18 #if defined(OS_WIN)	18 #if defined(OS_WIN)

19 #include "third_party/zlib/contrib/minizip/iowin32.h"	19 #include "third_party/zlib/contrib/minizip/iowin32.h"

20 #endif // defined(OS_WIN)	20 #endif // defined(OS_WIN)

21 #endif // defined(USE_SYSTEM_MINIZIP)	21 #endif // defined(USE_SYSTEM_MINIZIP)

22	22

(...skipping 278 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
301 }	301 }

302	302

303 void ZipReader::Reset() {	303 void ZipReader::Reset() {

304 zip_file_ = NULL;	304 zip_file_ = NULL;

305 num_entries_ = 0;	305 num_entries_ = 0;

306 reached_end_ = false;	306 reached_end_ = false;

307 current_entry_info_.reset();	307 current_entry_info_.reset();

308 }	308 }

309	309

310 } // namespace zip	310 } // namespace zip

OLD	NEW

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