Using native sheet to display modal dialogs for sign in

chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.h

Index: chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.h
diff --git a/chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.h b/chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.h
index d0dd30235fdf77c5ba21c658a55db62ed7cfa83f..8a5efedc1e7177d8bb516f486499b3ca4105cb6e 100644
--- a/chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.h
+++ b/chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.h
@@ -12,6 +12,7 @@
 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
 #include "chrome/browser/ui/profile_chooser_constants.h"
 #include "chrome/browser/ui/signin_view_controller_delegate.h"
+#include "ui/base/ui_base_types.h"
 
 @class ConstrainedWindowCustomWindow;
 class ConstrainedWindowMac;
@@ -33,18 +34,6 @@ enum class AccessPoint;
 class SigninViewControllerDelegateMac : public ConstrainedWindowMacDelegate,
                                         public SigninViewControllerDelegate {
  public:
-  // Creates and displays a constrained window off of |host_web_contents|,
-  // containing |web_contents|. If |wait_for_size| is true, the delegate will
-  // wait for ResizeNativeView() to be called by the base class before
-  // displaying the constrained window. Otherwise, the window's dimensions will
-  // be |frame|.
-  SigninViewControllerDelegateMac(
-      SigninViewController* signin_view_controller,
-      std::unique_ptr<content::WebContents> web_contents,
-      content::WebContents* host_web_contents,
-      NSRect frame,
-      bool wait_for_size);
-
   void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override;
 
   // Creates the web view that contains the signin flow in |mode| using
@@ -63,6 +52,22 @@ class SigninViewControllerDelegateMac : public ConstrainedWindowMacDelegate,
       Profile* profile);
 
  private:
+  friend SigninViewControllerDelegate;
+
+  // Creates and displays a constrained window off of |host_web_contents|,
+  // containing |web_contents|. If |wait_for_size| is true, the delegate will
+  // wait for ResizeNativeView() to be called by the base class before
+  // displaying the constrained window. Otherwise, the window's dimensions will
+  // be |frame|.
+  SigninViewControllerDelegateMac(
+      SigninViewController* signin_view_controller,
+      std::unique_ptr<content::WebContents> web_contents,
+      content::WebContents* host_web_contents,
+      NSRect frame,
+      ui::ModalType dialog_modal_type,
+      bool wait_for_size);
+  ~SigninViewControllerDelegateMac() override;
+
   void PerformClose() override;
   void ResizeNativeView(int height) override;
 
@@ -72,7 +77,8 @@ class SigninViewControllerDelegateMac : public ConstrainedWindowMacDelegate,
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) override;
 
-  ~SigninViewControllerDelegateMac() override;
+  // Deletes this object.
+  void DeleteThis();

[Peter Kasting, 2017/01/11 19:38:29]

Nit: I wonder if this should have a different name/description since it does
more cleanup than just deleting the object.

[jlebel, 2017/01/12 09:51:26]

Done.

 
   // The constrained window opened by this delegate to display signin flow
   // content.
@@ -90,6 +96,10 @@ class SigninViewControllerDelegateMac : public ConstrainedWindowMacDelegate,
   // The web contents that the constrained window is displayed off of.
   // Typically, this is going to be the active tab when the window is shown.
   content::WebContents* host_web_contents_;
+
+  // The dialog modal presentation type.
+  ui::ModalType dialog_modal_type_;
+
   NSRect window_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninViewControllerDelegateMac);