content/browser/renderer_host/clipboard_message_filter.cc - Issue 6873148: Include zlib.h properly

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: content/browser/renderer_host/clipboard_message_filter.cc

Issue 6873148: Include zlib.h properly (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Wrap in #if defined(USE_SYSTEM_ZLIB) Created 9 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: content/browser/renderer_host/clipboard_message_filter.cc

diff --git a/content/browser/renderer_host/clipboard_message_filter.cc b/content/browser/renderer_host/clipboard_message_filter.cc

index 65d217844579a6d44da5ed657bb98e90706ffe98..c69691a091c75647b698db815e2d6a4fd72b789a 100644

--- a/content/browser/renderer_host/clipboard_message_filter.cc

+++ b/content/browser/renderer_host/clipboard_message_filter.cc

@@ -4,6 +4,12 @@

#include "content/browser/renderer_host/clipboard_message_filter.h"

+#if defined(USE_SYSTEM_ZLIB)

+#include <zlib.h>

+#else

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

+#endif

#include "base/stl_util-inl.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/clipboard_dispatcher.h"

@@ -11,7 +17,6 @@

#include "googleurl/src/gurl.h"

#include "ipc/ipc_message_macros.h"

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

-#include "third_party/zlib/zlib.h"

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

#include "ui/gfx/size.h"

« no previous file with comments | « no previous file | content/content_browser.gypi » ('j') | no next file with comments »