Remove deprecated version of views::CreateDialogFrameView.

chrome/browser/ui/views/constrained_web_dialog_delegate_views.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 "chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ui/views/constrained_window_views.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 #include "ui/web_dialogs/web_dialog_ui.h"
 
 using content::WebContents;
 using ui::WebDialogDelegate;
 using ui::WebDialogWebContentsDelegate;
 using web_modal::NativeWebContentsModalDialog;
 using web_modal::WebContentsModalDialogManager;
 using web_modal::WebContentsModalDialogManagerDelegate;
 
 namespace {
 
 class ConstrainedWebDialogDelegateViews
     : public ConstrainedWebDialogDelegateBase {
  public:
-  ConstrainedWebDialogDelegateViews(
-      content::BrowserContext* browser_context,
-      WebDialogDelegate* delegate,
-      WebDialogWebContentsDelegate* tab_delegate,
-      views::WebView* view)
+  ConstrainedWebDialogDelegateViews(content::BrowserContext* browser_context,
+                                    WebDialogDelegate* delegate,
+                                    WebDialogWebContentsDelegate* tab_delegate,
+                                    views::WebView* view)
       : ConstrainedWebDialogDelegateBase(
             browser_context, delegate, tab_delegate),
         view_(view),
         window_(NULL) {}
 
   virtual ~ConstrainedWebDialogDelegateViews() {}
 
   // WebDialogWebContentsDelegate interface.
   virtual void CloseContents(WebContents* source) OVERRIDE {
     window_->Close();
@@ skipping 72 matching lines @@
   virtual const views::Widget* GetWidget() const OVERRIDE {
     return View::GetWidget();
   }
   virtual base::string16 GetWindowTitle() const OVERRIDE {
     return impl_->closed_via_webui() ? base::string16() :
         GetWebDialogDelegate()->GetDialogTitle();
   }
   virtual views::View* GetContentsView() OVERRIDE {
     return this;
   }
-  // TODO(wittman): Remove this override once we move to the new style frame
-  // view on all dialogs.
   virtual views::NonClientFrameView* CreateNonClientFrameView(
       views::Widget* widget) OVERRIDE {
-    return CreateConstrainedStyleNonClientFrameView(
-        widget,
-        GetWebContents()->GetBrowserContext());
+    return views::DialogDelegate::CreateDialogFrameView(widget);
   }
   virtual bool ShouldShowCloseButton() const OVERRIDE {
     // No close button if the dialog doesn't want a title bar.
     return impl_->GetWebDialogDelegate()->ShouldShowDialogTitle();
   }
 
   virtual ui::ModalType GetModalType() const OVERRIDE {
 #if defined(USE_ASH)
     return ui::MODAL_TYPE_CHILD;
 #else
@@ skipping 42 matching lines @@
       impl_(new ConstrainedWebDialogDelegateViews(browser_context,
                                                   delegate,
                                                   tab_delegate,
                                                   this)) {
   SetWebContents(GetWebContents());
 
   // Pressing ESC closes the dialog.
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
 }
 
-ConstrainedWebDialogDelegateViewViews::~ConstrainedWebDialogDelegateViewViews() {
+ConstrainedWebDialogDelegateViewViews::
+~ConstrainedWebDialogDelegateViewViews() {
 }
 
 ConstrainedWebDialogDelegate* CreateConstrainedWebDialog(
     content::BrowserContext* browser_context,
     WebDialogDelegate* delegate,
     WebDialogWebContentsDelegate* tab_delegate,
     content::WebContents* web_contents) {
   ConstrainedWebDialogDelegateViewViews* constrained_delegate =
       new ConstrainedWebDialogDelegateViewViews(
           browser_context, delegate, tab_delegate);
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   WebContentsModalDialogManagerDelegate* modal_delegate =
       web_contents_modal_dialog_manager->delegate();
   DCHECK(modal_delegate);
   views::Widget* window = views::Widget::CreateWindowAsFramelessChild(
       constrained_delegate,
       modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
   web_contents_modal_dialog_manager->ShowDialog(window->GetNativeView());
   constrained_delegate->SetWindow(window);
   return constrained_delegate;
 }