extensions/shell/app/shell_main_delegate.cc - Issue 696063008: Refactor ShellDesktopController and ShellNativeAppWindow to allow for non-aura implementations.

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: extensions/shell/app/shell_main_delegate.cc

Issue 696063008: Refactor ShellDesktopController and ShellNativeAppWindow to allow for non-aura implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: rebase Created 6 years, 1 month 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

« extensions/browser/app_window/test_app_window_contents.h ('K') | « extensions/shell/app/shell_main_delegate.h ('k') | extensions/shell/app_shell.gyp » ('j') | extensions/shell/browser/shell_native_app_window_aura.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/shell/app/shell_main_delegate.cc

diff --git a/extensions/shell/app/shell_main_delegate.cc b/extensions/shell/app/shell_main_delegate.cc

index d7aa5abe558d25de86e83904e22879e89fcab362..69f0e6181b661fb1d15aec4b6a4fca096d28abe4 100644

--- a/extensions/shell/app/shell_main_delegate.cc

+++ b/extensions/shell/app/shell_main_delegate.cc

@@ -26,8 +26,10 @@

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

#if defined(OS_LINUX)

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

-#include "components/nacl/zygote/nacl_fork_delegate_linux.h"

#endif // OS_LINUX

+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)

+#include "components/nacl/zygote/nacl_fork_delegate_linux.h"

+#endif // OS_POSIX && !OS_MACOSX && !OS_ANDROID

#endif // !DISABLE_NACL

namespace {

@@ -140,6 +142,9 @@ bool ShellMainDelegate::ProcessNeedsResourceBundle(

#if !defined(DISABLE_NACL)

process_type == switches::kNaClLoaderProcess ||

#endif

+#if defined(OS_MACOSX)

+ process_type == switches::kGpuProcess ||

+#endif

process_type == switches::kUtilityProcess;

}