| 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 dee3c1bf023a812cf5735daef50334be7ed2cefb..3a13d3fc3b7aacbf23a4a356f443774b7b28d17e 100644
|
| --- a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
|
| +++ b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
|
| @@ -46,7 +46,7 @@ class ConstrainedWebDialogDelegateViews
|
|
|
| // WebDialogWebContentsDelegate interface.
|
| virtual void CloseContents(WebContents* source) OVERRIDE {
|
| - GetWindow()->CloseConstrainedWindow();
|
| + GetWindow()->CloseWebContentsModalDialog();
|
| }
|
|
|
| // contents::WebContentsDelegate
|
| @@ -79,7 +79,7 @@ class ConstrainedWebDialogDelegateViewViews
|
| WebDialogWebContentsDelegate* tab_delegate);
|
| virtual ~ConstrainedWebDialogDelegateViewViews();
|
|
|
| - void set_window(ConstrainedWindow* window) {
|
| + void set_window(WebContentsModalDialog* window) {
|
| return impl_->set_window(window);
|
| }
|
|
|
| @@ -97,7 +97,7 @@ class ConstrainedWebDialogDelegateViewViews
|
| virtual void ReleaseWebContentsOnDialogClose() OVERRIDE {
|
| return impl_->ReleaseWebContentsOnDialogClose();
|
| }
|
| - virtual ConstrainedWindow* GetWindow() OVERRIDE {
|
| + virtual WebContentsModalDialog* GetWindow() OVERRIDE {
|
| return impl_->GetWindow();
|
| }
|
| virtual WebContents* GetWebContents() OVERRIDE {
|
| @@ -151,7 +151,7 @@ class ConstrainedWebDialogDelegateViewViews
|
| const ui::Accelerator& accelerator) OVERRIDE {
|
| // Pressing ESC closes the dialog.
|
| DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code());
|
| - GetWindow()->CloseConstrainedWindow();
|
| + GetWindow()->CloseWebContentsModalDialog();
|
| return true;
|
| }
|
| virtual gfx::Size GetPreferredSize() OVERRIDE {
|
| @@ -197,8 +197,8 @@ ConstrainedWebDialogDelegate* CreateConstrainedWebDialog(
|
| ConstrainedWebDialogDelegateViewViews* constrained_delegate =
|
| new ConstrainedWebDialogDelegateViewViews(
|
| browser_context, delegate, tab_delegate);
|
| - ConstrainedWindow* constrained_window =
|
| + WebContentsModalDialog* web_contents_modal_dialog =
|
| new ConstrainedWindowViews(web_contents, constrained_delegate);
|
| - constrained_delegate->set_window(constrained_window);
|
| + constrained_delegate->set_window(web_contents_modal_dialog);
|
| return constrained_delegate;
|
| }
|
|
|