Remove DialogDelegate::UseNewStyle and unused code.

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 "content/public/browser/web_contents_view.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"
 
@@ skipping 59 matching lines @@
       public ConstrainedWebDialogDelegate,
       public views::WidgetDelegate {
  public:
   ConstrainedWebDialogDelegateViewViews(
       content::BrowserContext* browser_context,
       WebDialogDelegate* delegate,
       WebDialogWebContentsDelegate* tab_delegate);
   virtual ~ConstrainedWebDialogDelegateViewViews();
 
   // ConstrainedWebDialogDelegate interface
-  virtual const WebDialogDelegate*
-      GetWebDialogDelegate() const OVERRIDE {
+  virtual const WebDialogDelegate* GetWebDialogDelegate() const OVERRIDE {
     return impl_->GetWebDialogDelegate();
   }
   virtual WebDialogDelegate* GetWebDialogDelegate() OVERRIDE {
     return impl_->GetWebDialogDelegate();
   }
   virtual void OnDialogCloseFromWebUI() OVERRIDE {
     return impl_->OnDialogCloseFromWebUI();
   }
   virtual void ReleaseWebContentsOnDialogClose() OVERRIDE {
     return impl_->ReleaseWebContentsOnDialogClose();
@@ skipping 40 matching lines @@
   }
 
   virtual ui::ModalType GetModalType() const OVERRIDE {
 #if defined(USE_ASH)
     return ui::MODAL_TYPE_CHILD;
 #else
     return views::WidgetDelegate::GetModalType();
 #endif
   }
 
-  virtual void OnWidgetMove() OVERRIDE {
-    // We need to check the existence of the widget because when running on
-    // WinXP this could get executed before the widget is entirely created.
-    if (!GetWidget())
-      return;
-
-    if (!views::DialogDelegate::UseNewStyle()) {
-      GetWidget()->CenterWindow(
-          GetWidget()->non_client_view()->GetPreferredSize());
-    }
-    views::WidgetDelegate::OnWidgetMove();
-  }
-
   // views::WebView overrides.
   virtual bool AcceleratorPressed(
       const ui::Accelerator& accelerator) OVERRIDE {
     // Pressing ESC closes the dialog.
     DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code());
     impl_->window()->Close();
     return true;
   }
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     gfx::Size size;
@@ skipping 43 matching lines @@
     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);

[sky, 2013/11/16 03:03:16]

and here.

[msw, 2013/11/16 04:15:44]

Done.

   views::Widget* window = views::Widget::CreateWindowAsFramelessChild(
       constrained_delegate,
-      web_contents->GetView()->GetNativeView(),
       modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
   web_contents_modal_dialog_manager->ShowDialog(window->GetNativeView());
   constrained_delegate->SetWindow(window);
   return constrained_delegate;
 }