Chromium Code Reviews| Index: chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc |
| diff --git a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc |
| index 423ebf830aaf3a3925908d3d850a99fd60612a92..847ca80aee6dd4d2c0cc4f58d99b211b293c2219 100644 |
| --- a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc |
| +++ b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc |
| @@ -11,7 +11,6 @@ |
| #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" |
| @@ -91,8 +90,7 @@ class ConstrainedWebDialogDelegateViewViews |
| virtual ~ConstrainedWebDialogDelegateViewViews(); |
| // ConstrainedWebDialogDelegate interface |
| - virtual const WebDialogDelegate* |
| - GetWebDialogDelegate() const OVERRIDE { |
| + virtual const WebDialogDelegate* GetWebDialogDelegate() const OVERRIDE { |
| return impl_->GetWebDialogDelegate(); |
| } |
| virtual WebDialogDelegate* GetWebDialogDelegate() OVERRIDE { |
| @@ -153,19 +151,6 @@ class ConstrainedWebDialogDelegateViewViews |
| #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 { |
| @@ -229,10 +214,8 @@ ConstrainedWebDialogDelegate* CreateConstrainedWebDialog( |
| 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); |