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

Unified Diff: content/content_common.gypi

Issue 8589001: Load mac sandbox definitions from resources instead of the bundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 9 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
Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 507d80e36a73d40f502895b7d777262311774d6c..58790b76f15ba0957404c2b5f4df2830cf361a4e 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -56,6 +56,7 @@
'public/common/resource_dispatcher_delegate.h',
'public/common/result_codes.h',
'public/common/sandbox_init.h',
+ 'public/common/sandbox_type_mac.h',
'public/common/security_style.h',
'public/common/serialized_script_value.cc',
'public/common/serialized_script_value.h',
@@ -216,6 +217,7 @@
'common/resource_dispatcher.h',
'common/resource_messages.h',
'common/sandbox_init_mac.cc',
+ 'common/sandbox_init_mac.h',
'common/sandbox_init_win.cc',
'common/sandbox_mac.h',
'common/sandbox_mac.mm',
@@ -270,11 +272,9 @@
],
}],
['OS=="mac"', {
- 'link_settings': {
- 'mac_bundle_resources': [
- 'common/common.sb',
- ],
- },
+ 'sources!': [
+ 'common/process_watcher_posix.cc',
jeremy 2011/11/25 19:53:16 Is this part of this CL on purpose?
jochen (gone - plz use gerrit) 2011/11/25 20:30:16 no, that's a rebase/merge screw-up Done
+ ],
}],
['toolkit_uses_gtk == 1', {
'dependencies': [

Powered by Google App Engine
This is Rietveld 408576698