chrome/utility/chrome_content_utility_client.cc - Issue 14021015: Move components/zip to third_party/zip

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

Unified Diff: chrome/utility/chrome_content_utility_client.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, 8 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:

Index: chrome/utility/chrome_content_utility_client.cc

diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc

index 18e2dec22747913b11e4692c558094dba37f4a80..46a6c0e587fca7085f95761daecd97f397b6ce8a 100644

--- a/chrome/utility/chrome_content_utility_client.cc

+++ b/chrome/utility/chrome_content_utility_client.cc

@@ -34,11 +34,11 @@

#include "chrome/common/safe_browsing/zip_analyzer.h"

#include "chrome/common/web_resource/web_resource_unpacker.h"

#include "chrome/utility/profile_import_handler.h"

-#include "components/zip/zip.h"

#include "content/public/utility/utility_thread.h"

#include "printing/backend/print_backend.h"

#include "printing/page_range.h"

#include "third_party/skia/include/core/SkBitmap.h"

+#include "third_party/zlib/google/zip.h"

#include "ui/base/ui_base_switches.h"

#include "ui/gfx/codec/jpeg_codec.h"

#include "ui/gfx/rect.h"

« no previous file with comments | « chrome/unit_tests.isolate ('k') | components/components.gyp » ('j') | no next file with comments »