Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(978)

Unified Diff: chrome/browser/chromeos/login/captive_portal_view.cc

Issue 63343004: Remove DialogDelegate::UseNewStyle and unused code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restore [D]CHECKs and loop scoping. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(

Powered by Google App Engine
This is Rietveld 408576698