Revert 198491 "Render opaque border with no shadow for web conte..."

trunk/src/ui/views/window/dialog_delegate.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 "ui/views/window/dialog_delegate.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 134 matching lines @@
   return new DialogClientView(widget, GetContentsView());
 }
 
 NonClientFrameView* DialogDelegate::CreateNonClientFrameView(Widget* widget) {
   return UseNewStyle() ? CreateNewStyleFrameView(widget) :
                          WidgetDelegate::CreateNonClientFrameView(widget);
 }
 
 // static
 NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(Widget* widget) {
-  return CreateNewStyleFrameView(widget, false);
-}
-
-NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(
-    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(new BubbleBorder(
-        BubbleBorder::NONE,
-        BubbleBorder::NO_SHADOW_OPAQUE_BORDER,
-        color));
-  } else {
-    frame->SetBubbleBorder(new BubbleBorder(BubbleBorder::FLOAT,
-                                            BubbleBorder::SMALL_SHADOW,
-                                            color));
-  }
+  frame->SetBubbleBorder(
+      new BubbleBorder(BubbleBorder::FLOAT, BubbleBorder::SMALL_SHADOW, color));
   frame->SetTitle(widget->widget_delegate()->GetWindowTitle());
   DialogDelegate* delegate = widget->widget_delegate()->AsDialogDelegate();
   if (delegate) {
     View* titlebar_view = delegate->CreateTitlebarExtraView();
     if (titlebar_view)
       frame->SetTitlebarExtraView(titlebar_view);
   }
   frame->SetShowCloseButton(true);
   frame->set_can_drag(true);
-  if (force_opaque_border)
-    widget->set_frame_type(views::Widget::FRAME_TYPE_FORCE_CUSTOM);
   return frame;
 }
 
 const DialogClientView* DialogDelegate::GetDialogClientView() const {
   return GetWidget()->client_view()->AsDialogClientView();
 }
 
 DialogClientView* DialogDelegate::GetDialogClientView() {
   return GetWidget()->client_view()->AsDialogClientView();
 }
@@ skipping 29 matching lines @@
 
 const Widget* DialogDelegateView::GetWidget() const {
   return View::GetWidget();
 }
 
 View* DialogDelegateView::GetContentsView() {
   return this;
 }
 
 }  // namespace views