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

Unified Diff: content/content_app.gypi

Issue 187183002: Add creation of ServiceManager to Content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge problem Created 6 years, 9 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/common/mojo/mojo_channel_init.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_app.gypi
diff --git a/content/content_app.gypi b/content/content_app.gypi
index 49081759a5bcb707b060782e875dd33f17e01efe..6187bce207e71e6244a133f57f2fa0aac3838a4b 100644
--- a/content/content_app.gypi
+++ b/content/content_app.gypi
@@ -24,6 +24,8 @@
'app/android/library_loader_hooks.cc',
'app/content_main.cc',
'app/content_main_runner.cc',
+ 'app/mojo/mojo_init.cc',
+ 'app/mojo/mojo_init.h',
'app/startup_helper_win.cc',
'public/app/android_library_loader_hooks.h',
'public/app/content_main.h',
@@ -55,5 +57,18 @@
'app/content_main.cc',
],
}],
+ ['use_mojo==0', {
+ 'sources!': [
+ 'app/mojo/mojo_init.cc',
+ 'app/mojo/mojo_init.h',
+ ],
+ }, {
+ 'dependencies': [
+ '../mojo/mojo.gyp:mojo_environment_chromium',
+ '../mojo/mojo.gyp:mojo_service_manager',
+ '../mojo/mojo.gyp:mojo_system',
+ '../mojo/mojo.gyp:mojo_system_impl',
+ ],
+ }],
],
}
« no previous file with comments | « content/common/mojo/mojo_channel_init.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698