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

Unified Diff: mojo/mojo_shell.gyp

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: mojo/mojo_shell.gyp
diff --git a/mojo/mojo_shell.gyp b/mojo/mojo_shell.gyp
index d39652c08891e073bb4eddbc11ebc3a098e5a99b..0569a6bd30690cea893175b43f3bbdfd9cd08f8b 100644
--- a/mojo/mojo_shell.gyp
+++ b/mojo/mojo_shell.gyp
@@ -25,6 +25,8 @@
'shell/query_util.h',
'shell/shell_impl.cc',
'shell/shell_impl.h',
+ 'shell/static_application_loader.cc',
+ 'shell/static_application_loader.h',
'shell/switches.cc',
'shell/switches.h',
'util/filename_util.cc',
@@ -34,12 +36,12 @@
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'<(DEPTH)/crypto/crypto.gyp:crypto',
- '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings_mojom',
+ '<(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)/mojo/mojo_services.gyp:network_service_bindings_lib',
- '<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl',
'<(DEPTH)/url/url.gyp:url_lib',
],
}, {
@@ -58,7 +60,6 @@
'<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium',
'<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters',
'<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_run_all_unittests',
- '<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_application_base',
'<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/url/url.gyp:url_lib',

Powered by Google App Engine
This is Rietveld 408576698