| 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 33aa9dd47efb0bba8d14089236c1408727d35079..4dd4adbb17d8617f32bc2cdfe645e023a86e632a 100644
|
| --- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h
|
| +++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h
|
| @@ -25,13 +25,13 @@ class ConstrainedWindowMacDelegate {
|
| };
|
|
|
| // Creates a ConstrainedWindowMac, shows the dialog, and returns it.
|
| -scoped_ptr<ConstrainedWindowMac> CreateAndShowWebModalDialogMac(
|
| +std::unique_ptr<ConstrainedWindowMac> CreateAndShowWebModalDialogMac(
|
| ConstrainedWindowMacDelegate* delegate,
|
| content::WebContents* web_contents,
|
| id<ConstrainedWindowSheet> sheet);
|
|
|
| // Creates a ConstrainedWindowMac and returns it.
|
| -scoped_ptr<ConstrainedWindowMac> CreateWebModalDialogMac(
|
| +std::unique_ptr<ConstrainedWindowMac> CreateWebModalDialogMac(
|
| ConstrainedWindowMacDelegate* delegate,
|
| content::WebContents* web_contents,
|
| id<ConstrainedWindowSheet> sheet);
|
| @@ -73,7 +73,7 @@ class ConstrainedWindowMac {
|
| SingleWebContentsDialogManagerCocoa* manager_; // weak, owned by WCMDM.
|
| content::WebContents* web_contents_; // weak, owned by dialog initiator.
|
| base::scoped_nsprotocol<id<ConstrainedWindowSheet>> sheet_;
|
| - scoped_ptr<SingleWebContentsDialogManagerCocoa> native_manager_;
|
| + std::unique_ptr<SingleWebContentsDialogManagerCocoa> native_manager_;
|
| };
|
|
|
| #endif // CHROME_BROWSER_UI_COCOA_CONSTRAINED_WINDOW_CONSTRAINED_WINDOW_MAC_
|
|
|