| Index: chrome/browser/ui/views/constrained_window_views.h
|
| diff --git a/chrome/browser/ui/views/constrained_window_views.h b/chrome/browser/ui/views/constrained_window_views.h
|
| index 8d75c1b58a9105d87a4cc37209b32bba6f4d1db5..818fbeb0b596a021e3c3dee02c20ad83c156dcd5 100644
|
| --- a/chrome/browser/ui/views/constrained_window_views.h
|
| +++ b/chrome/browser/ui/views/constrained_window_views.h
|
| @@ -6,7 +6,7 @@
|
| #define CHROME_BROWSER_UI_VIEWS_CONSTRAINED_WINDOW_VIEWS_H_
|
|
|
| #include "base/compiler_specific.h"
|
| -#include "chrome/browser/ui/constrained_window.h"
|
| +#include "chrome/browser/ui/web_contents_modal_dialog.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/gfx/rect.h"
|
| #include "ui/views/widget/widget.h"
|
| @@ -51,12 +51,12 @@ class NativeConstrainedWindow {
|
| ///////////////////////////////////////////////////////////////////////////////
|
| // ConstrainedWindowViews
|
| //
|
| -// A ConstrainedWindow implementation that implements a Constrained Window as
|
| -// a child HWND with a custom window frame. The ConstrainedWindowViews owns
|
| +// A WebContentsModalDialog implementation that implements the dialog as a
|
| +// child HWND with a custom window frame. The ConstrainedWindowViews owns
|
| // itself and will be deleted soon after being closed.
|
| //
|
| class ConstrainedWindowViews : public views::Widget,
|
| - public ConstrainedWindow,
|
| + public WebContentsModalDialog,
|
| public NativeConstrainedWindowDelegate {
|
| public:
|
| ConstrainedWindowViews(content::WebContents* web_contents,
|
| @@ -66,10 +66,10 @@ class ConstrainedWindowViews : public views::Widget,
|
| // Returns the WebContents that constrains this Constrained Window.
|
| content::WebContents* owner() const { return web_contents_; }
|
|
|
| - // Overridden from ConstrainedWindow:
|
| - virtual void ShowConstrainedWindow() OVERRIDE;
|
| - virtual void CloseConstrainedWindow() OVERRIDE;
|
| - virtual void FocusConstrainedWindow() OVERRIDE;
|
| + // Overridden from WebContentsModalDialog:
|
| + virtual void ShowWebContentsModalDialog() OVERRIDE;
|
| + virtual void CloseWebContentsModalDialog() OVERRIDE;
|
| + virtual void FocusWebContentsModalDialog() OVERRIDE;
|
| virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
|
|
|
| // Default insets for the dialog:
|
|
|