MacViews: Remove constrained window dependencies for certificate viewer.

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index a6bd4b18430fae00e8e406ef10b3d5db4ffcefac..372d728c1a97ce4973efa7b0266438a0fdde39d7 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -498,10 +498,10 @@
       'browser/ui/android/website_settings_popup_android.h',
       'browser/ui/browser_otr_state_android.cc',
       'browser/ui/screen_capture_notification_ui_stub.cc',
-      'browser/ui/webui/offline/offline_internals_ui_message_handler.cc',
-      'browser/ui/webui/offline/offline_internals_ui_message_handler.h',
       'browser/ui/webui/offline/offline_internals_ui.cc',
       'browser/ui/webui/offline/offline_internals_ui.h',
+      'browser/ui/webui/offline/offline_internals_ui_message_handler.cc',
+      'browser/ui/webui/offline/offline_internals_ui_message_handler.h',
       'browser/ui/webui/popular_sites_internals_message_handler.cc',
       'browser/ui/webui/popular_sites_internals_message_handler.h',
       'browser/ui/webui/popular_sites_internals_ui.cc',
@@ -779,12 +779,12 @@
       'browser/ui/app_list/arc/arc_app_model_builder.h',
       'browser/ui/app_list/arc/arc_app_utils.cc',
       'browser/ui/app_list/arc/arc_app_utils.h',
+      'browser/ui/app_list/arc/arc_package_sync_data_type_controller.cc',
+      'browser/ui/app_list/arc/arc_package_sync_data_type_controller.h',
       'browser/ui/app_list/arc/arc_package_syncable_service.cc',
       'browser/ui/app_list/arc/arc_package_syncable_service.h',
       'browser/ui/app_list/arc/arc_package_syncable_service_factory.cc',
       'browser/ui/app_list/arc/arc_package_syncable_service_factory.h',
-      'browser/ui/app_list/arc/arc_package_sync_data_type_controller.cc',
-      'browser/ui/app_list/arc/arc_package_sync_data_type_controller.h',
       'browser/ui/app_list/search/arc_app_result.cc',
       'browser/ui/app_list/search/arc_app_result.h',
       'browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc',
@@ -950,6 +950,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_cocoa.h',
       'browser/ui/cocoa/chooser_content_view_cocoa.mm',
       'browser/ui/cocoa/chrome_browser_window.h',
@@ -973,6 +975,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',
@@ -1255,6 +1264,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',
@@ -1354,8 +1365,8 @@
     ],
     # Files used only on desktop systems (not iOS, Android, ChromeOS).
     'chrome_browser_ui_desktop_sources': [
-      'browser/ui/avatar_button_error_controller.h',
       'browser/ui/avatar_button_error_controller.cc',
+      'browser/ui/avatar_button_error_controller.h',
       'browser/ui/avatar_button_error_controller_delegate.h',
       'browser/ui/startup/default_browser_infobar_delegate.cc',
       'browser/ui/startup/default_browser_infobar_delegate.h',
@@ -1444,6 +1455,8 @@
       'browser/ui/webui/certificate_viewer_webui.h',
     ],
     'chrome_browser_ui_mac_sources': [
+      'browser/ui/certificate_viewer_mac.h',
+      'browser/ui/certificate_viewer_mac.mm',
       'browser/ui/chrome_style.cc',
       'browser/ui/chrome_style.h',
       'browser/ui/cocoa/accelerator_utils_cocoa.mm',
@@ -1461,20 +1474,12 @@
       '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.mm',
       'browser/ui/cocoa/chrome_command_dispatcher_delegate.h',
       'browser/ui/cocoa/chrome_command_dispatcher_delegate.mm',
       'browser/ui/cocoa/color_chooser_mac.mm',
       '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',
@@ -1523,8 +1528,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',
@@ -2031,12 +2034,12 @@
       'browser/ui/webui/settings/font_handler.h',
       'browser/ui/webui/settings/languages_handler.cc',
       'browser/ui/webui/settings/languages_handler.h',
-      'browser/ui/webui/settings/metrics_reporting_handler.cc',
-      'browser/ui/webui/settings/metrics_reporting_handler.h',
       'browser/ui/webui/settings/md_settings_localized_strings_provider.cc',
       'browser/ui/webui/settings/md_settings_localized_strings_provider.h',
       'browser/ui/webui/settings/md_settings_ui.cc',
       'browser/ui/webui/settings/md_settings_ui.h',
+      'browser/ui/webui/settings/metrics_reporting_handler.cc',
+      'browser/ui/webui/settings/metrics_reporting_handler.h',
       'browser/ui/webui/settings/people_handler.cc',
       'browser/ui/webui/settings/people_handler.h',
       'browser/ui/webui/settings/profile_info_handler.cc',
@@ -2528,6 +2531,7 @@
     # migrate from mac_views_browser to a chrome://flag.
     'chrome_browser_ui_views_mac_experimental_sources': [
       'browser/ui/views/apps/chrome_app_window_client_views_mac.mm',
+      'browser/ui/views/certificate_viewer_mac_views.mm',
       'browser/ui/views/dropdown_bar_host_mac.mm',
       'browser/ui/views/frame/browser_frame_mac.h',
       'browser/ui/views/frame/browser_frame_mac.mm',