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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « mojo/fetcher/url_resolver_unittest.cc ('k') | mojo/runner/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [{ 6 'targets': [{
7 'target_name': 'mojo_shell_lib', 7 'target_name': 'mojo_shell_lib',
8 'type': 'static_library', 8 'type': 'static_library',
9 'sources': [ 9 'sources': [
10 'shell/application_instance.cc', 10 'shell/application_instance.cc',
11 'shell/application_instance.h', 11 'shell/application_instance.h',
12 'shell/application_loader.h', 12 'shell/application_loader.h',
13 'shell/application_manager.cc', 13 'shell/application_manager.cc',
14 'shell/application_manager.h', 14 'shell/application_manager.h',
15 'shell/capability_filter.cc', 15 'shell/capability_filter.cc',
16 'shell/capability_filter.h', 16 'shell/capability_filter.h',
17 'shell/connect_to_application_params.cc', 17 'shell/connect_to_application_params.cc',
18 'shell/connect_to_application_params.h', 18 'shell/connect_to_application_params.h',
19 'shell/content_handler_connection.cc', 19 'shell/content_handler_connection.cc',
20 'shell/content_handler_connection.h', 20 'shell/content_handler_connection.h',
21 'shell/data_pipe_peek.cc', 21 'shell/data_pipe_peek.cc',
22 'shell/data_pipe_peek.h', 22 'shell/data_pipe_peek.h',
23 'shell/fetcher.cc', 23 'shell/fetcher.cc',
24 'shell/fetcher.h', 24 'shell/fetcher.h',
25 'shell/identity.cc', 25 'shell/identity.cc',
26 'shell/identity.h', 26 'shell/identity.h',
27 'shell/local_fetcher.cc',
28 'shell/local_fetcher.h',
27 'shell/native_runner.h', 29 'shell/native_runner.h',
30 'shell/network_fetcher.cc',
31 'shell/network_fetcher.h',
28 'shell/query_util.cc', 32 'shell/query_util.cc',
29 'shell/query_util.h', 33 'shell/query_util.h',
30 'shell/static_application_loader.cc', 34 'shell/static_application_loader.cc',
31 'shell/static_application_loader.h', 35 'shell/static_application_loader.h',
32 'shell/switches.cc', 36 'shell/switches.cc',
33 'shell/switches.cc', 37 'shell/switches.cc',
38 'shell/update_fetcher.cc',
39 'shell/update_fetcher.h',
34 'util/filename_util.cc', 40 'util/filename_util.cc',
35 'util/filename_util.h', 41 'util/filename_util.h',
36 ], 42 ],
37 'dependencies': [ 43 'dependencies': [
38 '<(DEPTH)/base/base.gyp:base', 44 '<(DEPTH)/base/base.gyp:base',
39 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
40 '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_base',
41 '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings',
42 '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_lib',
43 '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium',
44 '<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters',
45 '<(DEPTH)/url/url.gyp:url_lib',
46 ],
47 }, {
48 'target_name': 'mojo_fetcher_lib',
49 'type': 'static_library',
50 'sources': [
51 'fetcher/about_fetcher.cc',
52 'fetcher/about_fetcher.h',
53 'fetcher/base_application_fetcher.cc',
54 'fetcher/base_application_fetcher.h',
55 'fetcher/local_fetcher.cc',
56 'fetcher/local_fetcher.h',
57 'fetcher/network_fetcher.cc',
58 'fetcher/network_fetcher.h',
59 'fetcher/switches.cc',
60 'fetcher/switches.h',
61 'fetcher/update_fetcher.cc',
62 'fetcher/update_fetcher.h',
63 'fetcher/url_resolver.cc',
64 'fetcher/url_resolver.h',
65 ],
66 'dependencies': [
67 '<(DEPTH)/base/base.gyp:base',
68 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 45 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
69 '<(DEPTH)/crypto/crypto.gyp:crypto', 46 '<(DEPTH)/crypto/crypto.gyp:crypto',
70 '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_base', 47 '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_base',
71 '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings', 48 '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings',
72 '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_lib', 49 '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_lib',
73 '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium', 50 '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium',
74 '<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters', 51 '<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters',
75 '<(DEPTH)/mojo/mojo_services.gyp:network_service_bindings_lib', 52 '<(DEPTH)/mojo/mojo_services.gyp:network_service_bindings_lib',
76 '<(DEPTH)/mojo/mojo_services.gyp:updater_bindings_lib', 53 '<(DEPTH)/mojo/mojo_services.gyp:updater_bindings_lib',
77 '<(DEPTH)/mojo/mojo_shell.gyp:mojo_shell_lib',
78 '<(DEPTH)/url/url.gyp:url_lib', 54 '<(DEPTH)/url/url.gyp:url_lib',
79 ] 55 ],
80 }, { 56 }, {
81 'target_name': 'mojo_shell_unittests', 57 'target_name': 'mojo_shell_unittests',
82 'type': 'executable', 58 'type': 'executable',
83 'sources': [ 59 'sources': [
84 'shell/application_manager_unittest.cc', 60 'shell/application_manager_unittest.cc',
85 'shell/capability_filter_unittest.cc', 61 'shell/capability_filter_unittest.cc',
86 'shell/query_util_unittest.cc', 62 'shell/query_util_unittest.cc',
87 ], 63 ],
88 'dependencies': [ 64 'dependencies': [
89 '<(DEPTH)/mojo/mojo_shell.gyp:mojo_shell_lib', 65 '<(DEPTH)/mojo/mojo_shell.gyp:mojo_shell_lib',
(...skipping 15 matching lines...) Expand all
105 'mojom_files': [ 81 'mojom_files': [
106 'shell/capability_filter_unittest.mojom', 82 'shell/capability_filter_unittest.mojom',
107 'shell/test.mojom', 83 'shell/test.mojom',
108 ], 84 ],
109 }, 85 },
110 'includes': [ 86 'includes': [
111 '../third_party/mojo/mojom_bindings_generator_explicit.gypi', 87 '../third_party/mojo/mojom_bindings_generator_explicit.gypi',
112 ], 88 ],
113 }], 89 }],
114 } 90 }
OLDNEW
« 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