Remove DialogDelegate::UseNewStyle and unused 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/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/login_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
 using autofill::PasswordForm;
 using content::BrowserThread;
 using content::WebContents;
 using web_modal::WebContentsModalDialogManager;
@@ skipping 119 matching lines @@
     // 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();
     WebContentsModalDialogManager* web_contents_modal_dialog_manager =
         WebContentsModalDialogManager::FromWebContents(requesting_contents);
     WebContentsModalDialogManagerDelegate* modal_delegate =
         web_contents_modal_dialog_manager->delegate();
-    CHECK(modal_delegate);

[sky, 2013/11/16 03:03:16]

and here

[msw, 2013/11/16 04:15:44]

Done.

     dialog_ = views::Widget::CreateWindowAsFramelessChild(
-        this,
-        requesting_contents->GetView()->GetNativeView(),
-        modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
+        this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
     web_contents_modal_dialog_manager->ShowDialog(dialog_->GetNativeView());
     NotifyAuthNeeded();
   }
 
   virtual void CloseDialog() OVERRIDE {
     // The hosting widget may have been freed.
     if (dialog_)
       dialog_->Close();
   }
 
  private:
   friend class base::RefCountedThreadSafe<LoginHandlerViews>;
   friend class LoginPrompt;
 
   virtual ~LoginHandlerViews() {}
 
   // The LoginView that contains the user's login information
   LoginView* login_view_;
 
   views::Widget* dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginHandlerViews);
 };
 
 // static
 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info,
                                    net::URLRequest* request) {
   return new LoginHandlerViews(auth_info, request);
 }