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

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 1779383002: MacViews: Remove constrained window dependencies for certificate viewer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move out ConstrainedWindowSheet to Cocoa-only, other review comments. Created 4 years, 7 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: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index f929ccbc496b22e310a13d1364187cd1e9853883..49f4b02c5674d7cb5cfb3673de5b5e6a67e74b23 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -773,7 +773,7 @@
'browser/ui/webui/chromeos/emulator/device_emulator_ui.cc',
'browser/ui/webui/chromeos/emulator/device_emulator_ui.h',
],
- # Mac sources, except when mac_views_browser==1
+ # Mac sources, except when mac_views_browser==1.
'chrome_browser_ui_cocoa_sources': [
'browser/ui/cocoa/animatable_image.h',
'browser/ui/cocoa/animatable_image.mm',
@@ -916,6 +916,8 @@
'browser/ui/cocoa/bubble_sync_promo_controller.mm',
'browser/ui/cocoa/bubble_view.h',
'browser/ui/cocoa/bubble_view.mm',
+ 'browser/ui/cocoa/certificate_viewer_mac_cocoa.h',
+ 'browser/ui/cocoa/certificate_viewer_mac_cocoa.mm',
'browser/ui/cocoa/chooser_content_view.h',
'browser/ui/cocoa/chooser_content_view.mm',
'browser/ui/cocoa/chrome_browser_window.h',
@@ -939,6 +941,13 @@
'browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.mm',
'browser/ui/cocoa/constrained_window/constrained_window_custom_window.h',
'browser/ui/cocoa/constrained_window/constrained_window_custom_window.mm',
+ 'browser/ui/cocoa/constrained_window/constrained_window_mac.h',
+ 'browser/ui/cocoa/constrained_window/constrained_window_mac.mm',
+ 'browser/ui/cocoa/constrained_window/constrained_window_sheet.h',
+ 'browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h',
+ 'browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.mm',
+ 'browser/ui/cocoa/constrained_window/constrained_window_sheet_info.h',
+ 'browser/ui/cocoa/constrained_window/constrained_window_sheet_info.mm',
'browser/ui/cocoa/constrained_window/constrained_window_web_dialog_sheet.h',
'browser/ui/cocoa/constrained_window/constrained_window_web_dialog_sheet.mm',
'browser/ui/cocoa/content_settings/collected_cookies_mac.h',
@@ -1231,6 +1240,8 @@
'browser/ui/cocoa/screen_capture_notification_ui_cocoa.mm',
'browser/ui/cocoa/session_crashed_bubble.mm',
'browser/ui/cocoa/simple_message_box_mac.mm',
+ 'browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.h',
+ 'browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm',
'browser/ui/cocoa/spinner_view.h',
'browser/ui/cocoa/spinner_view.mm',
'browser/ui/cocoa/sprite_view.h',
@@ -1440,6 +1451,7 @@
'browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm',
'browser/ui/cocoa/browser_window_command_handler.h',
'browser/ui/cocoa/browser_window_command_handler.mm',
+ 'browser/ui/cocoa/certificate_viewer_mac.h',
'browser/ui/cocoa/certificate_viewer_mac.mm',
'browser/ui/cocoa/chrome_command_dispatcher_delegate.h',
'browser/ui/cocoa/chrome_command_dispatcher_delegate.mm',
@@ -1447,13 +1459,6 @@
'browser/ui/cocoa/confirm_quit.h',
'browser/ui/cocoa/confirm_quit_panel_controller.h',
'browser/ui/cocoa/confirm_quit_panel_controller.mm',
- 'browser/ui/cocoa/constrained_window/constrained_window_mac.h',
- 'browser/ui/cocoa/constrained_window/constrained_window_mac.mm',
- 'browser/ui/cocoa/constrained_window/constrained_window_sheet.h',
- 'browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h',
- 'browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.mm',
- 'browser/ui/cocoa/constrained_window/constrained_window_sheet_info.h',
- 'browser/ui/cocoa/constrained_window/constrained_window_sheet_info.mm',
'browser/ui/cocoa/dock_icon.h',
'browser/ui/cocoa/dock_icon.mm',
'browser/ui/cocoa/download/download_item_drag_mac.mm',
@@ -1501,8 +1506,6 @@
'browser/ui/cocoa/profiles/profile_menu_controller.mm',
'browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h',
'browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm',
- 'browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.h',
- 'browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm',
'browser/ui/cocoa/status_icons/status_icon_mac.h',
'browser/ui/cocoa/status_icons/status_icon_mac.mm',
'browser/ui/cocoa/status_icons/status_tray_mac.h',
@@ -2524,6 +2527,8 @@
# TODO(jackhou): Move items to chrome_browser_ui_views_sources when they
# migrate from mac_views_browser to a chrome://flag.
'chrome_browser_ui_views_mac_experimental_sources': [
+ 'browser/ui/cocoa/certificate_viewer_mac_views.mm',
+ 'browser/ui/cocoa/native_web_contents_modal_dialog_manager_views_mac.mm',
'browser/ui/views/apps/chrome_app_window_client_views_mac.mm',
'browser/ui/views/dropdown_bar_host_mac.mm',
'browser/ui/views/frame/browser_frame_mac.h',

Powered by Google App Engine
This is Rietveld 408576698