content/browser/renderer_host/render_sandbox_host_linux.cc - Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux

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/render_sandbox_host_linux.cc

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 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:

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

Download patch

« no previous file with comments | « content/browser/renderer_host/render_message_filter.cc ('k') | content/browser/renderer_host/render_widget_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_sandbox_host_linux.cc

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

index 8b86435eb673f4d388a9d6edf7980245a98d982d..2aea9ed988f15e9d43a4b4235a7fb5a29a768141 100644

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

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

@@ -745,12 +745,9 @@ void RenderSandboxHostLinux::Init(const std::string& sandbox_path) {

childs_lifeline_fd_ = pipefds[1];

// We need to be monothreaded before we fork().

-#if !defined(TOOLKIT_GTK) && !defined(THREAD_SANITIZER)

- // Exclude gtk port as TestSuite in base/tests/test_suite.cc is calling

- // gtk_init.

- // TODO(oshima): Remove ifdef when above issues are resolved.

+#if !defined(THREAD_SANITIZER)

DCHECK_EQ(1, base::GetNumberOfThreads(base::GetCurrentProcessHandle()));

-#endif // !defined(TOOLKIT_GTK) && !defined(THREAD_SANITIZER)

+#endif // !defined(THREAD_SANITIZER)

pid_ = fork();

if (pid_ == 0) {

if (IGNORE_EINTR(close(fds[0])) < 0)

« no previous file with comments | « content/browser/renderer_host/render_message_filter.cc ('k') | content/browser/renderer_host/render_widget_helper.h » ('j') | no next file with comments »