Remove DialogDelegate::UseNewStyle and unused code.

chrome/browser/chromeos/login/captive_portal_window_proxy.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/chromeos/login/captive_portal_window_proxy.h"
 
 #include "chrome/browser/chromeos/login/captive_portal_view.h"
 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.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 "ui/views/widget/widget.h"
 
 using web_modal::WebContentsModalDialogManager;
 using web_modal::WebContentsModalDialogManagerDelegate;
 
 namespace chromeos {
 
 CaptivePortalWindowProxy::CaptivePortalWindowProxy(
     Delegate* delegate,
-    gfx::NativeWindow parent,
     content::WebContents* web_contents)
     : delegate_(delegate),
       widget_(NULL),
-      parent_(parent),
       web_contents_(web_contents) {
   DCHECK(GetState() == STATE_IDLE);
 }
 
 CaptivePortalWindowProxy::~CaptivePortalWindowProxy() {
   if (!widget_)
     return;
   DCHECK(GetState() == STATE_DISPLAYED);
   widget_->RemoveObserver(this);
   widget_->Close();
@@ skipping 17 matching lines @@
     return;
 
   InitCaptivePortalView();
 
   CaptivePortalView* captive_portal_view = captive_portal_view_.release();
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents_);
   DCHECK(web_contents_modal_dialog_manager);
   WebContentsModalDialogManagerDelegate* delegate =
       web_contents_modal_dialog_manager->delegate();
-  DCHECK(delegate);

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

I restored this one too.

-
   widget_ = views::Widget::CreateWindowAsFramelessChild(
       captive_portal_view,
-      parent_,
       delegate->GetWebContentsModalDialogHost()->GetHostView());
   captive_portal_view->Init();
 
   widget_->AddObserver(this);
   web_contents_modal_dialog_manager->ShowDialog(widget_->GetNativeView());
   DCHECK(GetState() == STATE_DISPLAYED);
 }
 
 void CaptivePortalWindowProxy::Close() {
   if (GetState() == STATE_DISPLAYED)
@@ skipping 40 matching lines @@
   } else {
     if (captive_portal_view_.get() == NULL)
       return STATE_DISPLAYED;
     else
       NOTREACHED();
   }
   return STATE_UNKNOWN;
 }
 
 }  // namespace chromeos