Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Unified Diff: extensions/shell/app_shell.gyp

Issue 437503004: Add NaCl support to app_shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: (nacl-init) rebase Created 6 years, 4 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: extensions/shell/app_shell.gyp
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 67d1af894ca3cf15feecf7e3ccf4e05927134470..b7ff4e096ba6287215e18a8fd53decc3531aa548 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -107,6 +107,36 @@
'<(DEPTH)/ui/display/display.gyp:display',
],
}],
+ ['disable_nacl==0', {
+ 'includes': [
+ '../../components/nacl/nacl_defines.gypi',
+ ],
+ 'defines': [
+ '<@(nacl_defines)',
+ ],
+ 'dependencies': [
+ '<(DEPTH)/components/nacl.gyp:nacl',
+ '<(DEPTH)/components/nacl.gyp:nacl_browser',
+ '<(DEPTH)/components/nacl.gyp:nacl_common',
+ '<(DEPTH)/components/nacl.gyp:nacl_renderer',
+ '<(DEPTH)/components/nacl.gyp:nacl_switches',
+ ],
+ 'sources': [
+ 'browser/shell_nacl_browser_delegate.cc',
+ 'browser/shell_nacl_browser_delegate.h',
+ 'browser/shell_nacl_browser_delegate.cc',
teravest 2014/08/12 15:48:31 It looks like these were accidentally pasted twice
James Cook 2014/08/12 18:17:05 Yep. Fixed.
+ 'browser/shell_nacl_browser_delegate.h',
+ ],
+ }],
+ ['enable_plugins==1', {
+ 'dependencies': [
+ '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_ipc',
+ ],
+ 'sources': [
+ 'browser/shell_browser_pepper_host_factory.cc',
+ 'browser/shell_browser_pepper_host_factory.h',
+ ],
+ }],
],
},
{

Powered by Google App Engine
This is Rietveld 408576698