content/app/content_main_runner.cc - Issue 2191643002: Label sandbox job object OOM as OOM in process termination.

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/app/content_main_runner.cc

Issue 2191643002: Label sandbox job object OOM as OOM in process termination. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: should not include windows code in platform independent parts Created 4 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:

View side-by-side diff with in-line comments

Download patch

Index: content/app/content_main_runner.cc

diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc

index 49b943477696f1c5f4e09ad8bb130efbdf095c58..d9e795cf47423991771572f0374472b9b03eadb9 100644

--- a/content/app/content_main_runner.cc

+++ b/content/app/content_main_runner.cc

@@ -67,7 +67,6 @@

#include "ipc/ipc_descriptors.h"

#include "ipc/ipc_switches.h"

#include "media/base/media.h"

-#include "sandbox/win/src/sandbox_types.h"

#include "ui/base/ui_base_paths.h"

#include "ui/base/ui_base_switches.h"

@@ -81,6 +80,7 @@

#include "base/trace_event/trace_event_etw_export_win.h"

#include "base/win/process_startup_helper.h"

+#include "sandbox/win/src/sandbox_types.h"

#include "ui/base/win/atl_module.h"

#include "ui/display/win/dpi.h"

#elif defined(OS_MACOSX)

« no previous file with comments | « base/process/kill_win.cc ('k') | sandbox/win/src/sandbox_types.h » ('j') | no next file with comments »