chrome/common/chrome_content_client.cc - Issue 1185333003: Implement GetSandboxType() on all platforms and implement for all process types.

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/common/chrome_content_client.cc

Issue 1185333003: Implement GetSandboxType() on all platforms and implement for all process types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: do not call base class from chrome's contentbrowserclient Created 5 years, 6 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: chrome/common/chrome_content_client.cc

diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc

index bbefaa0ca59d34162a272759ddab58cf9e041b05..673666881bb09e18bfd4d99ae18dd46c1c860cb1 100644

--- a/chrome/common/chrome_content_client.cc

+++ b/chrome/common/chrome_content_client.cc

@@ -44,13 +44,12 @@

#if defined(OS_WIN)

#include "base/win/registry.h"

#include "base/win/windows_version.h"

-#elif defined(OS_MACOSX)

-#include "components/nacl/common/nacl_sandbox_type_mac.h"

#endif

#if !defined(DISABLE_NACL)

#include "components/nacl/common/nacl_constants.h"

#include "components/nacl/common/nacl_process_type.h"

+#include "components/nacl/common/nacl_sandbox_type.h"

#endif

#if defined(ENABLE_PLUGINS)

« chrome/browser/chrome_content_browser_client.cc ('K') | « chrome/browser/chrome_content_browser_client.cc ('k') | components/nacl.gyp » ('j') | content/common/sandbox_win.h » ('J')