mojo/mojo.gyp - Issue 323593002: Mojo: Use network service to load non-local Mojo Apps.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: updates 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

Index: mojo/mojo.gyp

diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp

index ea21a851a8f2778eebc5eb912fb07bf0783aaa88..5a4ccb98f3dbcf5ad42234412fcf64d87d5e46cc 100644

--- a/mojo/mojo.gyp

+++ b/mojo/mojo.gyp

@@ -328,6 +328,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',

@@ -471,11 +473,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': [

@@ -501,24 +504,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') | mojo/shell/switches.cc » ('J')