| Index: ui/views/window/dialog_delegate.cc
|
| diff --git a/ui/views/window/dialog_delegate.cc b/ui/views/window/dialog_delegate.cc
|
| index b498e9e8692cd09776da6c45757b0c4cde7e75e8..cb5374acf5540c9adf8f1bc38b413022019f7507 100644
|
| --- a/ui/views/window/dialog_delegate.cc
|
| +++ b/ui/views/window/dialog_delegate.cc
|
| @@ -27,11 +27,6 @@ DialogDelegate::~DialogDelegate() {
|
| }
|
|
|
| // static
|
| -bool DialogDelegate::UseNewStyle() {
|
| - return true;
|
| -}
|
| -
|
| -// static
|
| Widget* DialogDelegate::CreateDialogWidget(DialogDelegate* dialog,
|
| gfx::NativeWindow context,
|
| gfx::NativeWindow parent) {
|
| @@ -153,17 +148,17 @@ ClientView* DialogDelegate::CreateClientView(Widget* widget) {
|
|
|
| NonClientFrameView* DialogDelegate::CreateNonClientFrameView(Widget* widget) {
|
| if (UseNewStyleForThisDialog())
|
| - return CreateNewStyleFrameView(widget);
|
| + return CreateDialogFrameView(widget);
|
| return WidgetDelegate::CreateNonClientFrameView(widget);
|
| }
|
|
|
| // static
|
| -NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(Widget* widget) {
|
| - return CreateNewStyleFrameView(widget, false);
|
| +NonClientFrameView* DialogDelegate::CreateDialogFrameView(Widget* widget) {
|
| + return CreateDialogFrameView(widget, false);
|
| }
|
|
|
| // static
|
| -NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(
|
| +NonClientFrameView* DialogDelegate::CreateDialogFrameView(
|
| Widget* widget,
|
| bool force_opaque_border) {
|
| BubbleFrameView* frame = new BubbleFrameView(gfx::Insets());
|
| @@ -195,7 +190,7 @@ NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(
|
| }
|
|
|
| bool DialogDelegate::UseNewStyleForThisDialog() const {
|
| - return UseNewStyle();
|
| + return true;
|
| }
|
|
|
| const DialogClientView* DialogDelegate::GetDialogClientView() const {
|
|
|