Use CustomFrameViewAsh in ash::Shell::CreateDefaultNonClientFrameView.

Misc Ash windows incorrectly get new style BubbleFrameViews.
Revert new dialog style change to CreateDefaultNonClientFrameView.
This reverts non-dialog Ash windows to the old CustomFrameViewAsh.
See before/after pics at http://crbug.com/241810#c17

Dialogs get frames from DialogDelegate::CreateNonClientFrameView.
( where 'dialogs' are DialogDelegate[View] [subclass] instances )

BUG=241125,241810,166075
TEST=Only dialog windows have the new-style bubble border. No windows have a double-border issue.
R=derat@chromium.org

Review URL: https://chromiumcodereview.appspot.com/15685017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203092 0039d316-1c4b-4281-b951-d872f2087c98

ash/shell.cc

@@ -100,7 +100,6 @@
 #include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
-#include "ui/views/window/dialog_delegate.h"
 
 #if !defined(OS_MACOSX)
 #include "ash/accelerators/accelerator_controller.h"
@@ -688,8 +687,6 @@ bool Shell::IsSystemModalWindowOpen() const {
 
 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView(
     views::Widget* widget) {
-  if (views::DialogDelegate::UseNewStyle())
-    return views::DialogDelegate::CreateNewStyleFrameView(widget);
   // Use translucent-style window frames for dialogs.
   CustomFrameViewAsh* frame_view = new CustomFrameViewAsh;
   frame_view->Init(widget);