Remove DialogDelegate::UseNewStyle and unused code.

chrome/browser/chromeos/login/captive_portal_view.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_view.h"
 
-#include "ash/wm/custom_frame_view_ash.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/captive_portal/captive_portal_detector.h"
 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/window/dialog_delegate.h"
@@ skipping 47 matching lines @@
   return l10n_util::GetStringFUTF16(IDS_LOGIN_CAPTIVE_PORTAL_WINDOW_TITLE,
                                     network_name);
 }
 
 bool CaptivePortalView::ShouldShowWindowTitle() const {
   return true;
 }
 
 views::NonClientFrameView* CaptivePortalView::CreateNonClientFrameView(
     views::Widget* widget) {
-  if (views::DialogDelegate::UseNewStyle()) {
-    const bool force_opaque_border = false;
-    return views::DialogDelegate::CreateNewStyleFrameView(widget,
-                                                          force_opaque_border);
-  }
-  ash::CustomFrameViewAsh* frame = new ash::CustomFrameViewAsh(widget);
-  // Always use "active" look.
-  frame->SetInactiveRenderingDisabled(true);
-  return frame;
+  return views::DialogDelegate::CreateDialogFrameView(widget);
 }
 
 void CaptivePortalView::NavigationStateChanged(
     const content::WebContents* source, unsigned changed_flags) {
   SimpleWebViewDialog::NavigationStateChanged(source, changed_flags);
 
   // Naive way to determine the redirection. This won't be needed after portal
   // detection will be done on the Chrome side.
   GURL url = source->GetLastCommittedURL();
   // Note, |url| will be empty for "client3.google.com/generate_204" page.
   if (!redirected_  && url != GURL::EmptyGURL() &&
       url != GURL(CaptivePortalStartURL())) {
     DLOG(INFO) << CaptivePortalStartURL() << " vs " << url.spec();
     redirected_ = true;
     proxy_->OnRedirected();
   }
 }
 
 void CaptivePortalView::LoadingStateChanged(content::WebContents* source) {
   SimpleWebViewDialog::LoadingStateChanged(source);
   // TODO(nkostylev): Fix case of no connectivity, check HTTP code returned.
   // Disable this heuristic as it has false positives.
   // Relying on just shill portal check to close dialog is fine.
   // if (!is_loading && !redirected_)
   //   proxy_->OnOriginalURLLoaded();
 }
 
 }  // namespace chromeos