Factor out uses of the WebContentsModalDialog interface from platform-independent code

chrome/browser/ui/views/login_prompt_views.cc

 // Copyright (c) 2012 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/login/login_prompt.h"
 
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/tab_contents/tab_util.h"
@@ skipping 17 matching lines @@
 
 // This class simply forwards the authentication from the LoginView (on
 // the UI thread) to the net::URLRequest (on the I/O thread).
 // This class uses ref counting to ensure that it lives until all InvokeLaters
 // have been called.
 class LoginHandlerViews : public LoginHandler,
                           public views::DialogDelegate {
  public:
   LoginHandlerViews(net::AuthChallengeInfo* auth_info, net::URLRequest* request)
       : LoginHandler(auth_info, request),
-        login_view_(NULL) {
+        login_view_(NULL),
+        dialog_(NULL) {
   }
 
   // LoginModelObserver implementation.
   virtual void OnAutofillDataAvailable(const string16& username,
                                        const string16& password) OVERRIDE {
     // Nothing to do here since LoginView takes care of autofill for win.
   }
 
   // views::DialogDelegate methods:
   virtual string16 GetDialogButtonLabel(
       ui::DialogButton button) const OVERRIDE {
     if (button == ui::DIALOG_BUTTON_OK)
       return l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_OK_BUTTON_LABEL);
     return DialogDelegate::GetDialogButtonLabel(button);
   }
 
   virtual string16 GetWindowTitle() const OVERRIDE {
     return l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_TITLE);
   }
 
   virtual void WindowClosing() OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
     WebContents* tab = GetWebContentsForLogin();
     if (tab)
       tab->GetRenderViewHost()->SetIgnoreInputEvents(false);
 
     // Reference is no longer valid.
-    SetDialog(NULL);
+    dialog_ = NULL;
 
     CancelAuth();
   }
 
   virtual void DeleteDelegate() OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
     // The constrained window is going to delete itself; clear our pointer.
-    SetDialog(NULL);
+    dialog_ = NULL;
     SetModel(NULL);
 
     ReleaseSoon();
   }
 
   virtual ui::ModalType GetModalType() const OVERRIDE {
 #if defined(USE_ASH)
     return ui::MODAL_TYPE_CHILD;
 #else
     return views::WidgetDelegate::GetModalType();
@@ skipping 41 matching lines @@
     // disassociating the model from the view, because the view will
     // be deleted before the password manager.
     login_view_ = new LoginView(explanation, manager);
 
     // Scary thread safety note: This can potentially be called *after* SetAuth
     // or CancelAuth (say, if the request was cancelled before the UI thread got
     // control).  However, that's OK since any UI interaction in those functions
     // will occur via an InvokeLater on the UI thread, which is guaranteed
     // to happen after this is called (since this was InvokeLater'd first).
     WebContents* requesting_contents = GetWebContentsForLogin();
-    SetDialog(ConstrainedWindowViews::Create(requesting_contents, this));
+    dialog_ = ConstrainedWindowViews::Create(requesting_contents, this);
     NotifyAuthNeeded();
   }
 
+  virtual void CloseDialog() OVERRIDE {
+    // The hosting WebContentsModalDialog may have been freed.
+    if (dialog_)
+      dialog_->CloseWebContentsModalDialog();
+  }
+
  private:
   friend class base::RefCountedThreadSafe<LoginHandlerViews>;
   friend class LoginPrompt;
 
   virtual ~LoginHandlerViews() {}
 
   // The LoginView that contains the user's login information
   LoginView* login_view_;
 
+  ConstrainedWindowViews* dialog_;
+
   DISALLOW_COPY_AND_ASSIGN(LoginHandlerViews);
 };
 
 // static
 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info,
                                    net::URLRequest* request) {
   return new LoginHandlerViews(auth_info, request);
 }