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

Unified Diff: content/content_browser.gypi

Issue 1149833007: Embed a mojo ApplicationManager in content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 6b8e55599fec2d518fa6670c75aa2e1895de0a7b..74260afea443d9eaa210bab0ae93a8672b86308d 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -11,10 +11,15 @@
'../device/vibration/vibration.gyp:device_vibration',
'../device/vibration/vibration.gyp:device_vibration_mojo_bindings',
'../google_apis/google_apis.gyp:google_apis',
+ '../mojo/mojo_base.gyp:mojo_application_base',
+ '../mojo/mojo_base.gyp:mojo_url_type_converters',
+ '../mojo/mojo_services.gyp:network_service_bindings_lib',
+ '../mojo/mojo_shell.gyp:mojo_shell_lib',
'../net/net.gyp:net',
'../net/net.gyp:net_extras',
'../skia/skia.gyp:skia',
'../sql/sql.gyp:sql',
+ '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
'../third_party/re2/re2.gyp:re2',
'../third_party/zlib/google/zip.gyp:zip',
'../third_party/zlib/zlib.gyp:zlib',
@@ -165,6 +170,7 @@
'public/browser/media_device_id.h',
'public/browser/message_port_delegate.h',
'public/browser/message_port_provider.h',
+ 'public/browser/mojo_app_connection.h',
'public/browser/native_web_keyboard_event.h',
'public/browser/navigation_controller.cc',
'public/browser/navigation_controller.h',
@@ -1030,8 +1036,12 @@
'browser/message_port_service.h',
'browser/mime_registry_message_filter.cc',
'browser/mime_registry_message_filter.h',
+ 'browser/mojo/mojo_app_connection_impl.cc',
+ 'browser/mojo/mojo_app_connection_impl.h',
'browser/mojo/mojo_application_host.cc',
'browser/mojo/mojo_application_host.h',
+ 'browser/mojo/mojo_shell_context.cc',
+ 'browser/mojo/mojo_shell_context.h',
'browser/mojo/service_registrar_android.cc',
'browser/mojo/service_registrar_android.h',
'browser/mojo/service_registry_android.cc',

Powered by Google App Engine
This is Rietveld 408576698