Replace DialogFrameView with an enhanced BubbleFrameView.

ash/shell.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 "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 76 matching lines @@
 #include "ui/views/corewm/compound_event_filter.h"
 #include "ui/views/corewm/corewm_switches.h"
 #include "ui/views/corewm/focus_controller.h"
 #include "ui/views/corewm/input_method_event_filter.h"
 #include "ui/views/corewm/shadow_controller.h"
 #include "ui/views/corewm/visibility_controller.h"
 #include "ui/views/corewm/window_modality_controller.h"
 #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_frame_view.h"
+#include "ui/views/window/dialog_delegate.h"
 
 #if !defined(OS_MACOSX)
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_filter.h"
 #include "ash/accelerators/nested_dispatcher_controller.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "ash/ash_constants.h"
 #include "ash/display/display_change_observer_x11.h"
@@ skipping 542 matching lines @@
           ui::MODAL_TYPE_SYSTEM && (*wit)->TargetVisibility()) {
         return true;
       }
     }
   }
   return false;
 }
 
 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView(
     views::Widget* widget) {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          ::switches::kEnableNewDialogStyle)) {
-    return new views::DialogFrameView(string16());
-  }
+  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);
   return frame_view;
 }
 
 void Shell::RotateFocus(Direction direction) {
   focus_cycler_->RotateFocus(
       direction == FORWARD ? internal::FocusCycler::FORWARD :
                              internal::FocusCycler::BACKWARD);
@@ skipping 262 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     active_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash