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 2341f7cd754ae6ba70d656a0c03fd329a6e4a001..8a004392d3ee7055723e452a1efc6ad4b0d5ced0 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -897,6 +897,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/chrome_browser_window.h',
       'browser/ui/cocoa/chrome_browser_window.mm',
       'browser/ui/cocoa/chrome_event_processing_window.h',
@@ -918,6 +920,12 @@
       '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',
@@ -1206,6 +1214,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',
@@ -1411,6 +1421,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',
@@ -1418,13 +1429,7 @@
       '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',
@@ -1472,8 +1477,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,9 @@
     # 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.h',
+      '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/infobars/legacy_infobars_mac.cc',
     ],
@@ -3157,6 +3163,11 @@
             ['exclude', '^browser/ui/cocoa/'],
           ],
         }],
+        ['mac_views_browser==0', {
+          'sources': [
+            '../components/web_modal/web_contents_modal_dialog_views.cc'

[tapted, 2016/05/13 06:08:46]

there should be a variable somewhere that this can go instead, so we don't break
.gn

[Patti Lor, 2016/05/18 04:48:37]

Deleted! This has been moved to web_modal.gypi.

+          ],
+        }],
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',