Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2226)

Unified Diff: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_

Powered by Google App Engine
This is Rietveld 408576698