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

Unified Diff: components/app_modal_dialogs.gypi

Issue 666533007: Move JavaScriptDialogManager, JavascriptAppModalDialogViews to components/app_modal_dialogs (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 1 month 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: components/app_modal_dialogs.gypi
diff --git a/components/app_modal_dialogs.gypi b/components/app_modal_dialogs.gypi
index df3c3ec73fdc8e0ffb0e9807315438cd8f82f56e..171d50284a0966ed355a4606a88241d5ec3d8771 100644
--- a/components/app_modal_dialogs.gypi
+++ b/components/app_modal_dialogs.gypi
@@ -7,8 +7,9 @@
'target_name': 'app_modal_dialogs',
'type': 'static_library',
'dependencies': [
- '../skia/skia.gyp:skia',
'../content/content.gyp:content_browser',
+ '../content/content.gyp:content_common',
+ '../skia/skia.gyp:skia',
'components_strings.gyp:components_strings',
],
'include_dirs': [
@@ -17,11 +18,17 @@
'sources': [
'app_modal_dialogs/app_modal_dialog.cc',
'app_modal_dialogs/app_modal_dialog.h',
- 'app_modal_dialogs/app_modal_dialog_test_util.h',
'app_modal_dialogs/app_modal_dialog_queue.cc',
'app_modal_dialogs/app_modal_dialog_queue.h',
+ 'app_modal_dialogs/app_modal_dialog_test_util.h',
'app_modal_dialogs/javascript_app_modal_dialog.cc',
'app_modal_dialogs/javascript_app_modal_dialog.h',
+ 'app_modal_dialogs/javascript_dialog_extensions_client.h',
+ 'app_modal_dialogs/javascript_dialog_manager.cc',
+ 'app_modal_dialogs/javascript_dialog_manager.h',
+ 'app_modal_dialogs/javascript_dialog_manager_impl.cc',
+ 'app_modal_dialogs/javascript_dialog_manager_impl.h',
+ 'app_modal_dialogs/javascript_native_dialog_factory.h',
'app_modal_dialogs/native_app_modal_dialog.h'
],
'conditions': [
@@ -29,7 +36,13 @@
'dependencies': [
'../ui/aura/aura.gyp:aura',
],
- }]
+ }],
+ ['toolkit_views==1 and OS!="mac"', {
+ 'sources': [
+ 'app_modal_dialogs/views/javascript_app_modal_dialog_views.h',
+ 'app_modal_dialogs/views/javascript_app_modal_dialog_views.cc',
+ ],
+ }],
],
},
],

Powered by Google App Engine
This is Rietveld 408576698