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

Unified Diff: mojo/mojo_shell.gyp

Issue 1338283003: Revert of Move fetching logic out of ApplicationManager, eliminate url mappings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/fetcher/url_resolver_unittest.cc ('k') | mojo/runner/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_shell.gyp
diff --git a/mojo/mojo_shell.gyp b/mojo/mojo_shell.gyp
index 598ef3dd115cd5283b7fe7bfd046a2e5a767bea5..319ca648467c3b7ff1b4d96ec53246b2e168f6a5 100644
--- a/mojo/mojo_shell.gyp
+++ b/mojo/mojo_shell.gyp
@@ -24,44 +24,21 @@
'shell/fetcher.h',
'shell/identity.cc',
'shell/identity.h',
+ 'shell/local_fetcher.cc',
+ 'shell/local_fetcher.h',
'shell/native_runner.h',
+ 'shell/network_fetcher.cc',
+ 'shell/network_fetcher.h',
'shell/query_util.cc',
'shell/query_util.h',
'shell/static_application_loader.cc',
'shell/static_application_loader.h',
'shell/switches.cc',
'shell/switches.cc',
+ 'shell/update_fetcher.cc',
+ 'shell/update_fetcher.h',
'util/filename_util.cc',
'util/filename_util.h',
- ],
- 'dependencies': [
- '<(DEPTH)/base/base.gyp:base',
- '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_base',
- '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings',
- '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_lib',
- '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium',
- '<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters',
- '<(DEPTH)/url/url.gyp:url_lib',
- ],
- }, {
- 'target_name': 'mojo_fetcher_lib',
- 'type': 'static_library',
- 'sources': [
- 'fetcher/about_fetcher.cc',
- 'fetcher/about_fetcher.h',
- 'fetcher/base_application_fetcher.cc',
- 'fetcher/base_application_fetcher.h',
- 'fetcher/local_fetcher.cc',
- 'fetcher/local_fetcher.h',
- 'fetcher/network_fetcher.cc',
- 'fetcher/network_fetcher.h',
- 'fetcher/switches.cc',
- 'fetcher/switches.h',
- 'fetcher/update_fetcher.cc',
- 'fetcher/update_fetcher.h',
- 'fetcher/url_resolver.cc',
- 'fetcher/url_resolver.h',
],
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
@@ -74,9 +51,8 @@
'<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters',
'<(DEPTH)/mojo/mojo_services.gyp:network_service_bindings_lib',
'<(DEPTH)/mojo/mojo_services.gyp:updater_bindings_lib',
- '<(DEPTH)/mojo/mojo_shell.gyp:mojo_shell_lib',
'<(DEPTH)/url/url.gyp:url_lib',
- ]
+ ],
}, {
'target_name': 'mojo_shell_unittests',
'type': 'executable',
« no previous file with comments | « mojo/fetcher/url_resolver_unittest.cc ('k') | mojo/runner/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698