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 c2b30b70ff5627a49d202cd30cd56eee0c7876cd..d423156040abdc3a6a3919829ec50d525a928c62 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -946,6 +946,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',
@@ -969,6 +971,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',
@@ -1263,6 +1272,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',
@@ -1471,6 +1482,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',
@@ -1478,13 +1490,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',
@@ -1534,8 +1539,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',
@@ -2581,6 +2584,7 @@
     # 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',

[msw, 2016/08/22 23:01:18]

should this be moved to browser/ui/views?

[Patti Lor, 2016/08/25 08:25:12]

Oh, that's a good point. I'll let rsesek@ make the final decision on this, but I
think I agree with you. It's weird though, I feel like if that's the case, where
should certificate_viewer_mac.{h,mm} go? Since it's not strictly for a Cocoa
build.

Have made the move for now, along with certificate_viewer_mac.{h,mm} into
chrome/browser/ui/).

[Robert Sesek, 2016/08/25 21:32:38]

Hm, I don't really have a strong opinion. I'd defer to Trent, but he's out.
Maybe ask Elly?

[Elly Fong-Jones, 2016/08/26 16:42:35]

Things like this which are objective-c wrappers around the Views version of a
dialog generally live in chrome/browser/ui/cocoa, since they're only used in
cocoa builds with views dialogs enabled - ie, a mac_views_browser=1 build won't
use them. You can put certificate_viewer_mac.{h,mm} wherever you like.

[Patti Lor, 2016/08/29 01:10:21]

Thanks for taking a look Elly :) I'll leave it where it is then.

       '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',