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

Unified Diff: mojo/mojo.gyp

Issue 323593002: Mojo: Use network service to load non-local Mojo Apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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
« no previous file with comments | « mojo/common/data_pipe_utils.cc ('k') | mojo/public/cpp/bindings/lib/connector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 4218afdab623e1556e4ac76afaf99d7c91e688b3..cf8c26eba5a9d5e1dce8c91d65e471537ee5fecc 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -329,6 +329,8 @@
'common/channel_init.h',
'common/common_type_converters.cc',
'common/common_type_converters.h',
+ 'common/data_pipe_utils.cc',
+ 'common/data_pipe_utils.h',
'common/environment_data.cc',
'common/environment_data.h',
'common/handle_watcher.cc',
@@ -472,11 +474,12 @@
'../url/url.gyp:url_lib',
'mojo_external_service_bindings',
'mojo_gles2_impl',
+ 'mojo_native_viewport_service',
+ 'mojo_network_bindings',
'mojo_service_manager',
'mojo_service_provider_bindings',
- 'mojo_system_impl',
- 'mojo_native_viewport_service',
'mojo_spy',
+ 'mojo_system_impl',
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'sources': [
@@ -502,24 +505,18 @@
'shell/in_process_dynamic_service_runner.h',
'shell/keep_alive.cc',
'shell/keep_alive.h',
- 'shell/loader.cc',
- 'shell/loader.h',
- 'shell/network_delegate.cc',
- 'shell/network_delegate.h',
+ 'shell/mojo_url_resolver.cc',
+ 'shell/mojo_url_resolver.h',
'shell/out_of_process_dynamic_service_runner.cc',
'shell/out_of_process_dynamic_service_runner.h',
'shell/run.cc',
'shell/run.h',
- 'shell/storage.cc',
- 'shell/storage.h',
'shell/switches.cc',
'shell/switches.h',
'shell/task_runners.cc',
'shell/task_runners.h',
'shell/test_child_process.cc',
'shell/test_child_process.h',
- 'shell/url_request_context_getter.cc',
- 'shell/url_request_context_getter.h',
'shell/view_manager_loader.cc',
'shell/view_manager_loader.h',
],
« no previous file with comments | « mojo/common/data_pipe_utils.cc ('k') | mojo/public/cpp/bindings/lib/connector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698