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

Unified Diff: content/content_browser.gypi

Issue 1128453004: Embed a simple Mojo shell in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index b4ef74a059c36e359c0acd57effc1075be4c7779..ff1814a5742772b39c1fd1f6850d1025573fb573 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -11,6 +11,7 @@
'../device/battery/battery.gyp:device_battery',
'../device/battery/battery.gyp:device_battery_mojo_bindings',
'../google_apis/google_apis.gyp:google_apis',
+ '../mojo/mojo_shell.gyp:mojo_shell_lib',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../sql/sql.gyp:sql',
@@ -158,6 +159,9 @@
'public/browser/media_device_id.h',
'public/browser/message_port_delegate.h',
'public/browser/message_port_provider.h',
+ 'public/browser/mojo_app_connection.cc',
+ 'public/browser/mojo_app_connection.h',
+ 'public/browser/mojo_shell_context.h',
'public/browser/native_web_keyboard_event.h',
'public/browser/navigation_controller.cc',
'public/browser/navigation_controller.h',
@@ -434,7 +438,7 @@
'browser/background_sync/background_sync_manager.cc',
'browser/background_sync/background_sync_manager.h',
'browser/background_sync/background_sync_network_observer.cc',
- 'browser/background_sync/background_sync_network_observer.h',
+ 'browser/background_sync/background_sync_network_observer.h',
'browser/bad_message.cc',
'browser/bad_message.h',
'browser/bluetooth/bluetooth_dispatcher_host.cc',
@@ -1006,6 +1010,8 @@
'browser/message_port_service.h',
'browser/mime_registry_message_filter.cc',
'browser/mime_registry_message_filter.h',
+ 'browser/mojo_shell_context_impl.cc',
+ 'browser/mojo_shell_context_impl.h',
'browser/mojo/mojo_application_host.cc',
'browser/mojo/mojo_application_host.h',
'browser/mojo/service_registrar_android.cc',

Powered by Google App Engine
This is Rietveld 408576698