Add Views implementation of ProfileSigninConfirmationDialog.

chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.cc

 // Copyright (c) 2013 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.
 
 #include "chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.h"
 
 #include "base/basictypes.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 24 matching lines @@
   const ProfileSigninConfirmationDialog* dialog_;
 
   // Dialog button callbacks.
   base::Closure cancel_signin_;
   base::Closure signin_with_new_profile_;
   base::Closure continue_signin_;
 };
 
 }  // namespace
 
+#if !defined(TOOLKIT_VIEWS)
+namespace chrome {
+// static
+// Declared in browser_dialogs.h
+void ShowProfileSigninConfirmationDialog(
+    Profile* profile,
+    const std::string& username,
+    const base::Closure& cancel_signin,
+    const base::Closure& signin_with_new_profile,
+    const base::Closure& continue_signin) {
+  ProfileSigninConfirmationDialog* dialog =
+      new ProfileSigninConfirmationDialog(profile,
+                                          username,
+                                          cancel_signin,
+                                          signin_with_new_profile,
+                                          continue_signin);
+  ui::CheckShouldPromptForNewProfile(
+      profile,
+      // This callback is guaranteed to be invoked, and once it is, the dialog
+      // owns itself.
+      base::Bind(&ProfileSigninConfirmationDialog::Show,
+                 base::Unretained(dialog)));
+}
+}  // namespace chrome
+#endif
+
 ProfileSigninConfirmationHandler::ProfileSigninConfirmationHandler(
       const ProfileSigninConfirmationDialog* dialog,
       const base::Closure& cancel_signin,
       const base::Closure& signin_with_new_profile,
       const base::Closure& continue_signin)
   : dialog_(dialog),
     cancel_signin_(cancel_signin),
     signin_with_new_profile_(signin_with_new_profile),
     continue_signin_(continue_signin) {
 }
@@ skipping 25 matching lines @@
   signin_with_new_profile_.Run();
   dialog_->Close();
 }
 
 void ProfileSigninConfirmationHandler::OnContinueButtonClicked(
     const base::ListValue* args) {
   continue_signin_.Run();
   dialog_->Close();
 }
 
-void ProfileSigninConfirmationDialog::ShowDialog(
-    Profile* profile,
-    const std::string& username,
-    const base::Closure& cancel_signin,
-    const base::Closure& signin_with_new_profile,
-    const base::Closure& continue_signin) {
-  ProfileSigninConfirmationDialog *dialog =
-    new ProfileSigninConfirmationDialog(profile,
-                                        username,
-                                        cancel_signin,
-                                        signin_with_new_profile,
-                                        continue_signin);
-  ui::CheckShouldPromptForNewProfile(
-      profile,
-      base::Bind(&ProfileSigninConfirmationDialog::Show,
-                 dialog->weak_pointer_factory_.GetWeakPtr()));
-}
-
 ProfileSigninConfirmationDialog::ProfileSigninConfirmationDialog(
     Profile* profile,
     const std::string& username,
     const base::Closure& cancel_signin,
     const base::Closure& signin_with_new_profile,
     const base::Closure& continue_signin)
-  : username_(username),
+  : delegate_(NULL),
+    username_(username),
     prompt_for_new_profile_(true),
     cancel_signin_(cancel_signin),
     signin_with_new_profile_(signin_with_new_profile),
     continue_signin_(continue_signin),
-    profile_(profile),
-    weak_pointer_factory_(this) {
+    profile_(profile) {
 }
 
 ProfileSigninConfirmationDialog::~ProfileSigninConfirmationDialog() {
 }
 
 void ProfileSigninConfirmationDialog::Close() const {
   closed_by_handler_ = true;
   delegate_->OnDialogCloseFromWebUI();
 }
 
 void ProfileSigninConfirmationDialog::Show(bool prompt) {
-  prompt_for_new_profile_ = prompt;
-
   Browser* browser = FindBrowserWithProfile(profile_,
                                             chrome::GetActiveDesktop());
   if (!browser) {
     DLOG(WARNING) << "No browser found to display the confirmation dialog";
     cancel_signin_.Run();
+    delete this;

[James Hawkins, 2013/05/07 17:22:44]

This is really fragile.  Don't we have a ScopedDeleter or something which we can
cancel on the success case (or pass ownership through
CreateConstrainedWebDialog)?

[dconnelly, 2013/05/07 17:31:30]

I don't know anything about that, but it sounds good. I'll look into it first
thing tomorrow.

[dconnelly, 2013/05/13 14:45:21]

No longer needed

     return;
   }
-
   content::WebContents* web_contents =
       browser->tab_strip_model()->GetActiveWebContents();
   if (!web_contents) {
     DLOG(WARNING) << "No web contents found to display the confirmation dialog";
     cancel_signin_.Run();
+    delete this;
     return;
   }
-
+  prompt_for_new_profile_ = prompt;
   delegate_ = CreateConstrainedWebDialog(profile_, this, NULL, web_contents);
 }
 
 ui::ModalType ProfileSigninConfirmationDialog::GetDialogModalType() const {
   return ui::MODAL_TYPE_WINDOW;
 }
 
 string16 ProfileSigninConfirmationDialog::GetDialogTitle() const {
   return l10n_util::GetStringUTF16(
       IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_DIALOG_TITLE);
@@ skipping 45 matching lines @@
 void ProfileSigninConfirmationDialog::OnCloseContents(
     content::WebContents* source,
     bool* out_close_dialog) {
   if (out_close_dialog)
     *out_close_dialog = true;
 }
 
 bool ProfileSigninConfirmationDialog::ShouldShowDialogTitle() const {
   return true;
 }