| Index: chrome/browser/chromeos/login/captive_portal_view.cc
|
| diff --git a/chrome/browser/chromeos/login/captive_portal_view.cc b/chrome/browser/chromeos/login/captive_portal_view.cc
|
| index 96f348ff6a7b3ed190e5482763086966c7fa9fb9..738c04538d23e69229fab46381ad27aa080691f8 100644
|
| --- a/chrome/browser/chromeos/login/captive_portal_view.cc
|
| +++ b/chrome/browser/chromeos/login/captive_portal_view.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #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"
|
| @@ -72,15 +71,7 @@ bool CaptivePortalView::ShouldShowWindowTitle() const {
|
|
|
| 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(
|
|
|