Cleanup: Remove deprecated version of views::CreateDialogFrameView().

ui/views/window/dialog_delegate.cc

Index: ui/views/window/dialog_delegate.cc
===================================================================
--- ui/views/window/dialog_delegate.cc	(revision 249524)
+++ ui/views/window/dialog_delegate.cc	(working copy)
@@ -13,10 +13,7 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/window/dialog_client_view.h"
-
-#if defined(USE_AURA)
 #include "ui/views/corewm/shadow_types.h"

[Mike Wittman, 2014/02/07 15:02:44]

include order

[Lei Zhang, 2014/02/07 22:55:21]

Done.

-#endif
 
 namespace views {
 
@@ -158,35 +155,19 @@
 
 // static
 NonClientFrameView* DialogDelegate::CreateDialogFrameView(Widget* widget) {
-  return CreateDialogFrameView(widget, false);
-}
-
-// static
-NonClientFrameView* DialogDelegate::CreateDialogFrameView(
-    Widget* widget,
-    bool force_opaque_border) {
   BubbleFrameView* frame = new BubbleFrameView(gfx::Insets());
   const SkColor color = widget->GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_DialogBackground);
-  if (force_opaque_border) {
-    frame->SetBubbleBorder(scoped_ptr<BubbleBorder>(new BubbleBorder(
-        BubbleBorder::NONE, BubbleBorder::NO_SHADOW_OPAQUE_BORDER, color)));
-  } else {
-    frame->SetBubbleBorder(scoped_ptr<BubbleBorder>(new BubbleBorder(
-        BubbleBorder::FLOAT, BubbleBorder::SMALL_SHADOW, color)));
-  }
+  frame->SetBubbleBorder(scoped_ptr<BubbleBorder>(new BubbleBorder(
+      BubbleBorder::FLOAT, BubbleBorder::SMALL_SHADOW, color)));
   DialogDelegate* delegate = widget->widget_delegate()->AsDialogDelegate();
   if (delegate) {
     View* titlebar_view = delegate->CreateTitlebarExtraView();
     if (titlebar_view)
       frame->SetTitlebarExtraView(titlebar_view);
   }
-  if (force_opaque_border)
-    widget->set_frame_type(views::Widget::FRAME_TYPE_FORCE_CUSTOM);
-#if defined(USE_AURA)
   // TODO(msw): Add a matching shadow type and remove the bubble frame border?
   corewm::SetShadowType(widget->GetNativeWindow(), corewm::SHADOW_TYPE_NONE);
-#endif
   return frame;
 }