content/renderer/render_view_browsertest.cc - Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.

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/renderer/render_view_browsertest.cc

Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.

Patch Set: Rebased again Created 3 years, 5 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/renderer/render_view_browsertest.cc

diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc

index 0a7da2c93a89b7ca9aa5aa952bafb48e5895e848..191b6af923b414b41425f287f530633457f72805 100644

--- a/content/renderer/render_view_browsertest.cc

+++ b/content/renderer/render_view_browsertest.cc

@@ -96,6 +96,7 @@

#if defined(USE_AURA) && defined(USE_X11)

#include <X11/Xlib.h>

+#undef None // Defined by X11/X.h to 0L which collides with other headers

#include "base/memory/ptr_util.h"

#include "ui/events/event_constants.h"

#include "ui/events/keycodes/keyboard_code_conversion.h"

« no previous file with comments | « content/renderer/render_frame_proxy.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »