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

Unified Diff: mojo/mojo_services.gypi

Issue 400113005: A new WM bootstrap flow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 5 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_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index 4c13c0a61269a6e63ddc60d72c4157a050ebd33b..14fbb12b836564f469f9e377f7c8d47e783f39e8 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -722,6 +722,8 @@
'services/view_manager/view.cc',
'services/view_manager/view.h',
'services/view_manager/view_manager_export.h',
+ 'services/view_manager/view_manager_init_service_context.cc',
+ 'services/view_manager/view_manager_init_service_context.h',
'services/view_manager/view_manager_init_service_impl.cc',
'services/view_manager/view_manager_init_service_impl.h',
'services/view_manager/view_manager_service_impl.cc',
@@ -800,8 +802,8 @@
'includes': [ 'build/package_app.gypi' ],
},
{
- 'target_name': 'mojo_core_window_manager',
- 'type': 'loadable_module',
+ 'target_name': 'mojo_core_window_manager_lib',
+ 'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'../ui/base/ui_base.gyp:ui_base',
@@ -814,10 +816,8 @@
'mojo_core_window_manager_bindings',
'mojo_environment_chromium',
'mojo_view_manager_lib',
- '<(mojo_system_for_loadable_module)',
],
'sources': [
- 'public/cpp/application/lib/mojo_main_chromium.cc',
'services/window_manager/window_manager_app.cc',
'services/window_manager/window_manager_app.h',
'services/window_manager/window_manager_service_impl.cc',
@@ -825,6 +825,18 @@
],
},
{
+ 'target_name': 'mojo_core_window_manager',
+ 'type': 'loadable_module',
+ 'dependencies': [
+ 'mojo_core_window_manager_lib',
+ '<(mojo_system_for_loadable_module)',
+ ],
+ 'sources': [
+ 'public/cpp/application/lib/mojo_main_chromium.cc',
+ 'services/window_manager/main.cc',
+ ],
+ },
+ {
'target_name': 'mojo_core_window_manager_unittests',
'type': 'executable',
'dependencies': [

Powered by Google App Engine
This is Rietveld 408576698