MacViews: Remove constrained window dependencies for certificate viewer.

chrome/chrome_browser_ui.gypi

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 892 matching lines @@
       'browser/ui/cocoa/browser_window_layout.h',
       'browser/ui/cocoa/browser_window_layout.mm',
       'browser/ui/cocoa/browser_window_utils.h',
       'browser/ui/cocoa/browser_window_utils.mm',
       'browser/ui/cocoa/bubble_combobox.h',
       'browser/ui/cocoa/bubble_combobox.mm',
       'browser/ui/cocoa/bubble_sync_promo_controller.h',
       '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.h',
+      'browser/ui/cocoa/certificate_viewer_mac.mm',
       'browser/ui/cocoa/chrome_browser_window.h',
       'browser/ui/cocoa/chrome_browser_window.mm',
       'browser/ui/cocoa/chrome_event_processing_window.h',
       'browser/ui/cocoa/chrome_event_processing_window.mm',
       'browser/ui/cocoa/clickhold_button_cell.h',
       'browser/ui/cocoa/clickhold_button_cell.mm',
       'browser/ui/cocoa/confirm_bubble_cocoa.h',
       'browser/ui/cocoa/confirm_bubble_cocoa.mm',
       'browser/ui/cocoa/confirm_bubble_controller.h',
       'browser/ui/cocoa/confirm_bubble_controller.mm',
       'browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm',
       'browser/ui/cocoa/constrained_window/constrained_window_alert.h',
       'browser/ui/cocoa/constrained_window/constrained_window_alert.mm',
       'browser/ui/cocoa/constrained_window/constrained_window_button.h',
       'browser/ui/cocoa/constrained_window/constrained_window_button.mm',
       'browser/ui/cocoa/constrained_window/constrained_window_control_utils.h',
       'browser/ui/cocoa/constrained_window/constrained_window_control_utils.mm',
       'browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h',
       '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_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',
       'browser/ui/cocoa/content_settings/collected_cookies_mac.mm',
       'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h',
       'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm',
       'browser/ui/cocoa/content_settings/cookie_details.h',
       'browser/ui/cocoa/content_settings/cookie_details.mm',
       'browser/ui/cocoa/content_settings/cookie_details_view_controller.h',
       'browser/ui/cocoa/content_settings/cookie_details_view_controller.mm',
@@ skipping 275 matching lines @@
       'browser/ui/cocoa/profiles/user_manager_mac.h',
       'browser/ui/cocoa/profiles/user_manager_mac.mm',
       'browser/ui/cocoa/rect_path_utils.h',
       'browser/ui/cocoa/rect_path_utils.mm',
       'browser/ui/cocoa/restart_browser.h',
       'browser/ui/cocoa/restart_browser.mm',
       'browser/ui/cocoa/screen_capture_notification_ui_cocoa.h',
       '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.mm',
       'browser/ui/cocoa/spinner_view.h',
       'browser/ui/cocoa/spinner_view.mm',
       'browser/ui/cocoa/sprite_view.h',
       'browser/ui/cocoa/sprite_view.mm',
       'browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h',
       'browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm',
       'browser/ui/cocoa/status_bubble_mac.h',
       'browser/ui/cocoa/status_bubble_mac.mm',
       'browser/ui/cocoa/styled_text_field.h',
       'browser/ui/cocoa/styled_text_field.mm',
@@ skipping 164 matching lines @@
     # Counts desktop Linux and ChromeOS.
     'chrome_browser_ui_linux_sources': [
       'browser/ui/certificate_dialogs.cc',
       'browser/ui/certificate_dialogs.h',
       'browser/ui/webui/certificate_viewer_ui.cc',
       'browser/ui/webui/certificate_viewer_ui.h',
       'browser/ui/webui/certificate_viewer_webui.cc',
       'browser/ui/webui/certificate_viewer_webui.h',
     ],
     'chrome_browser_ui_mac_sources': [
+      'browser/mac/certificate_viewer_base.h',
+      'browser/mac/certificate_viewer_base.mm',
       'browser/ui/chrome_style.cc',
       'browser/ui/chrome_style.h',
       'browser/ui/cocoa/accelerator_utils_cocoa.mm',
       'browser/ui/cocoa/accelerators_cocoa.h',
       'browser/ui/cocoa/accelerators_cocoa.mm',
       'browser/ui/cocoa/apps/app_shim_menu_controller_mac.h',
       'browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm',
       'browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc',
       'browser/ui/cocoa/apps/quit_with_apps_controller_mac.h',
       'browser/ui/cocoa/apps/titlebar_background_view.h',
       'browser/ui/cocoa/apps/titlebar_background_view.mm',
       'browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h',
       'browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm',
       'browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h',
       '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',
       'browser/ui/cocoa/download/download_util_mac.h',
       'browser/ui/cocoa/download/download_util_mac.mm',
       'browser/ui/cocoa/encoding_menu_controller_delegate_mac.h',
       'browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm',
       'browser/ui/cocoa/first_run_dialog.h',
       'browser/ui/cocoa/first_run_dialog.mm',
       'browser/ui/cocoa/handoff_active_url_observer.cc',
@@ skipping 27 matching lines @@
       'browser/ui/cocoa/native_window_tracker_cocoa.mm',
       'browser/ui/cocoa/notifications/message_center_tray_bridge.h',
       'browser/ui/cocoa/notifications/message_center_tray_bridge.mm',
       'browser/ui/cocoa/nsmenuitem_additions.h',
       'browser/ui/cocoa/nsmenuitem_additions.mm',
       'browser/ui/cocoa/panels/display_settings_provider_cocoa.mm',
       'browser/ui/cocoa/profiles/profile_menu_controller.h',
       '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',

[tapted, 2016/03/21 02:47:13]

header should move as well

[Patti Lor, 2016/05/03 00:05:01]

Done.

-      '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',
       'browser/ui/cocoa/status_icons/status_tray_mac.mm',
       'browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h',
       'browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm',
       'browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h',
       'browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.mm',
       'browser/ui/cocoa/ui_localizer.h',
       'browser/ui/cocoa/ui_localizer.mm',
@@ skipping 1052 matching lines @@
       'browser/ui/views/extensions/media_galleries_dialog_views.h',
       'browser/ui/views/extensions/media_gallery_checkbox_view.cc',
       'browser/ui/views/extensions/media_gallery_checkbox_view.h',
     ],
     # MacViews sources that we still want to keep behind a compile-time flag.
     # 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/views/apps/chrome_app_window_client_views_mac.mm',
       'browser/ui/views/infobars/legacy_infobars_mac.cc',
+      'browser/ui/views/mac/certificate_viewer_views_mac.h',
+      'browser/ui/views/mac/certificate_viewer_views_mac.mm',
+      'browser/ui/views/mac/web_contents_modal_dialog_manager_views_mac.h',

[tapted, 2016/03/21 02:47:13]

I'm pretty sure we use this to parent toolkit-views dialogs in the Cocoa
browser, so it can probably stay where it is

[Patti Lor, 2016/05/03 00:05:01]

Done.

+      'browser/ui/views/mac/web_contents_modal_dialog_manager_views_mac.mm',
     ],
     # Windows-only. Assume ash/aura/views.
     'chrome_browser_ui_win_sources': [
       'browser/ui/input_method/input_method_engine.cc',
       'browser/ui/input_method/input_method_engine.h',
       'browser/ui/input_method/input_method_engine_base.cc',
       'browser/ui/input_method/input_method_engine_base.h',
       'browser/ui/network_profile_bubble.cc',
       'browser/ui/network_profile_bubble.h',
       'browser/ui/views/color_chooser_dialog.cc',
@@ skipping 799 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }