[OSX] support for login dialog queue

rogerwang · rogerwang · commit aec6069063d7 · 2013-11-29T12:47:04.000+08:00
diff --git a/src/browser/shell_login_dialog.h b/src/browser/shell_login_dialog.h
@@ -88,13 +88,13 @@ class ShellLoginDialog : public ResourceDispatcherHostLoginDelegate,
   // Returns whether authentication had been handled (SetAuth or CancelAuth).
   bool WasAuthHandled() const;
 
+  // Performs necessary cleanup before deletion.
+  void ReleaseSoon();
+
  protected:
   // Threading: any
   virtual ~ShellLoginDialog();
 
-  // Performs necessary cleanup before deletion.
-  void ReleaseSoon();
-
  private:
 
   // popup next dialog in queue on closing of this dialog
@@ -172,6 +172,7 @@ class ShellLoginDialog : public ResourceDispatcherHostLoginDelegate,
 #if defined(OS_MACOSX)
   // Threading: UI thread.
   ShellLoginDialogHelper* helper_;  // owned
+  base::string16 message_;
 #elif defined(OS_WIN)
   HWND dialog_win_;
   string16 message_text_;
diff --git a/src/browser/shell_login_dialog_mac.mm b/src/browser/shell_login_dialog_mac.mm
@@ -80,11 +80,14 @@ - (void)focus {
 - (void)alertDidEnd:(NSAlert*)alert
          returnCode:(int)returnCode
         contextInfo:(void*)contextInfo {
-  if (returnCode == NSRunStoppedResponse)
-    return;
 
   content::ShellLoginDialog* this_dialog =
       reinterpret_cast<content::ShellLoginDialog*>(contextInfo);
+  if (returnCode == NSRunStoppedResponse) {
+    this_dialog->ReleaseSoon();
+    return;
+  }
+
   if (returnCode == NSAlertFirstButtonReturn) {
     this_dialog->UserAcceptedAuth(
         base::SysNSStringToUTF16([usernameField_ stringValue]),
@@ -106,11 +109,14 @@ - (void)cancel {
 void ShellLoginDialog::PlatformCreateDialog(const string16& message) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   helper_ = [[ShellLoginDialogHelper alloc] init];
+  message_ = message;
+}
 
+void ShellLoginDialog::PlatformShowDialog() {
   // Show the modal dialog.
   NSAlert* alert = [helper_ alert];
   [alert setDelegate:helper_];
-  [alert setInformativeText:base::SysUTF16ToNSString(message)];
+  [alert setInformativeText:base::SysUTF16ToNSString(message_)];
   [alert setMessageText:@"Please log in."];
   [alert addButtonWithTitle:@"OK"];
   NSButton* other = [alert addButtonWithTitle:@"Cancel"];
