third_party/zlib/google/zip_internal.cc - Issue 15995038: Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, print…

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_internal.cc

Issue 15995038: Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, print… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: better Created 7 years, 6 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) 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 "third_party/zlib/google/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/strings/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>

16 #else	16 #else

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

18 #include "third_party/zlib/contrib/minizip/zip.h"	18 #include "third_party/zlib/contrib/minizip/zip.h"

19 #if defined(OS_WIN)	19 #if defined(OS_WIN)

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

(...skipping 286 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

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