| Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h
|
| diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h
|
| index 390c6f894ba4b8823da0617760f731316f04b805..ccf4e3ab89489d7a04490c0eed7adf9d474ecb9c 100644
|
| --- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h
|
| +++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h
|
| @@ -8,7 +8,7 @@
|
| #import <Cocoa/Cocoa.h>
|
|
|
| #include "base/memory/scoped_nsobject.h"
|
| -#include "chrome/browser/ui/constrained_window.h"
|
| +#include "chrome/browser/ui/web_contents_modal_dialog.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
|
|
| @@ -28,7 +28,7 @@ class ConstrainedWindowMacDelegate {
|
| // Constrained window implementation for Mac.
|
| // Normally an instance of this class is owned by the delegate. The delegate
|
| // should delete the instance when the window is closed.
|
| -class ConstrainedWindowMac : public ConstrainedWindow,
|
| +class ConstrainedWindowMac : public WebContentsModalDialog,
|
| public content::NotificationObserver {
|
| public:
|
| ConstrainedWindowMac(
|
| @@ -37,13 +37,13 @@ class ConstrainedWindowMac : public ConstrainedWindow,
|
| id<ConstrainedWindowSheet> sheet);
|
| virtual ~ConstrainedWindowMac();
|
|
|
| - // ConstrainedWindow implementation.
|
| - virtual void ShowConstrainedWindow() OVERRIDE;
|
| + // WebContentsModalDialog implementation.
|
| + virtual void ShowWebContentsModalDialog() OVERRIDE;
|
| // Closes the constrained window and deletes this instance.
|
| - virtual void CloseConstrainedWindow() OVERRIDE;
|
| - virtual void PulseConstrainedWindow() OVERRIDE;
|
| + virtual void CloseWebContentsModalDialog() OVERRIDE;
|
| + virtual void PulseWebContentsModalDialog() OVERRIDE;
|
| virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
|
| - virtual bool CanShowConstrainedWindow() OVERRIDE;
|
| + virtual bool CanShowWebContentsModalDialog() OVERRIDE;
|
|
|
| // content::NotificationObserver:
|
| virtual void Observe(int type,
|
| @@ -56,7 +56,7 @@ class ConstrainedWindowMac : public ConstrainedWindow,
|
|
|
| ConstrainedWindowMacDelegate* delegate_; // weak, owns us.
|
|
|
| - // The WebContents that owns and constrains this ConstrainedWindow. Weak.
|
| + // The WebContents that owns and constrains this WebContentsModalDialog. Weak.
|
| content::WebContents* web_contents_;
|
|
|
| scoped_nsprotocol<id<ConstrainedWindowSheet> > sheet_;
|
|
|