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

chrome/browser/ui/login/login_prompt.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 <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/synchronization/lock.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/browser/ui/web_contents_modal_dialog.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "net/base/auth.h"
@@ skipping 45 matching lines @@
   signon_realm.append(auth_info.realm);
   return signon_realm;
 }
 
 // ----------------------------------------------------------------------------
 // LoginHandler
 
 LoginHandler::LoginHandler(net::AuthChallengeInfo* auth_info,
                            net::URLRequest* request)
     : handled_auth_(false),
-      dialog_(NULL),
       auth_info_(auth_info),
       request_(request),
       http_network_session_(
           request_->context()->http_transaction_factory()->GetSession()),
       password_manager_(NULL),
       login_model_(NULL) {
   // This constructor is called on the I/O thread, so we cannot load the nib
   // here. BuildViewForPasswordManager() will be invoked on the UI thread
   // later, so wait with loading the nib until then.
   DCHECK(request_) << "LoginHandler constructed with NULL request";
@@ skipping 143 matching lines @@
 }
 
 void LoginHandler::SetModel(LoginModel* model) {
   if (login_model_)
     login_model_->SetObserver(NULL);
   login_model_ = model;
   if (login_model_)
     login_model_->SetObserver(this);
 }
 
-void LoginHandler::SetDialog(WebContentsModalDialog* dialog) {
-  dialog_ = dialog;
-}
-
 void LoginHandler::NotifyAuthNeeded() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (WasAuthHandled())
     return;
 
   content::NotificationService* service =
       content::NotificationService::current();
   NavigationController* controller = NULL;
 
   WebContents* requesting_contents = GetWebContentsForLogin();
@@ skipping 111 matching lines @@
     // Verify that CancelAuth doesn't destroy the request via our delegate.
     DCHECK(request_ != NULL);
     ResetLoginHandlerForRequest(request_);
   }
 }
 
 // Closes the view_contents from the UI loop.
 void LoginHandler::CloseContentsDeferred() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  // The hosting WebContentsModalDialog may have been freed.
-  if (dialog_)
-    dialog_->CloseWebContentsModalDialog();
+  CloseDialog();
 }
 
 // Helper to create a PasswordForm and stuff it into a vector as input
 // for PasswordManager::PasswordFormsParsed, the hook into PasswordManager.
 void MakeInputForPasswordManager(
     const GURL& request_url,
     net::AuthChallengeInfo* auth_info,
     LoginHandler* handler,
     std::vector<PasswordForm>* password_manager_input) {
   PasswordForm dialog_form;
@@ skipping 74 matching lines @@
 
 LoginHandler* CreateLoginPrompt(net::AuthChallengeInfo* auth_info,
                                 net::URLRequest* request) {
   LoginHandler* handler = LoginHandler::Create(auth_info, request);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&LoginDialogCallback, request->url(),
                  make_scoped_refptr(auth_info), make_scoped_refptr(handler)));
   return handler;
 }