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

Unified Diff: components/constrained_window.gypi

Issue 2087643003: Move web modal dialog manager files into the constrained_window component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert NativeManagerTracker split, delete CreateNativeWebModalManager impls w/ two left for Cocoa a… Created 4 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: components/constrained_window.gypi
diff --git a/components/constrained_window.gypi b/components/constrained_window.gypi
index 9abba05d18bdc223692a542f6ad9226382e35421..59049681475761814a9929e51166aba326b8512d 100644
--- a/components/constrained_window.gypi
+++ b/components/constrained_window.gypi
@@ -8,8 +8,9 @@
'type': 'static_library',
'dependencies': [
'<(DEPTH)/components/components.gyp:web_modal',
- '<(DEPTH)/ui/views/views.gyp:views',
+ '<(DEPTH)/content/content.gyp:content_browser',
'<(DEPTH)/skia/skia.gyp:skia',
+ '<(DEPTH)/ui/views/views.gyp:views',
],
'include_dirs': [
'..',
@@ -18,6 +19,21 @@
'constrained_window/constrained_window_views.cc',
'constrained_window/constrained_window_views.h',
'constrained_window/constrained_window_views_client.h',
+ 'constrained_window/native_web_contents_modal_dialog_manager_views.cc',
+ 'constrained_window/native_web_contents_modal_dialog_manager_views.h',
+ ],
+ 'conditions': [
+ ['use_aura==1', {
+ 'dependencies': [
+ '<(DEPTH)/ui/aura/aura.gyp:aura',
+ '<(DEPTH)/ui/wm/wm.gyp:wm',
+ ],
+ }],
+ ["OS=='macosx' and mac_views_browser==0", {
tapted 2016/07/19 09:29:41 you need to swap the quote types here and use "mac
Patti Lor 2016/07/28 01:29:31 Done, thanks!
+ 'sources': [ 'constrained_window/show_modal_dialog_cocoa.cc' ],
+ }, {
+ 'sources': [ 'constrained_window/show_modal_dialog_views.cc' ],
+ }],
],
},
],

Powered by Google App Engine
This is Rietveld 408576698