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

Unified Diff: ui/views/controls/webview/webview.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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
« no previous file with comments | « ui/views/controls/webview/webview.h ('k') | ui/views/controls/webview/webview_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/webview/webview.cc
diff --git a/ui/views/controls/webview/webview.cc b/ui/views/controls/webview/webview.cc
index 686eeb6ddd4a4d78541e966cca8f3ce20e861b81..dee63428831a06b0867e9c459a18fbe659804a1b 100644
--- a/ui/views/controls/webview/webview.cc
+++ b/ui/views/controls/webview/webview.cc
@@ -112,11 +112,11 @@ const char* WebView::GetClassName() const {
return kViewClassName;
}
-scoped_ptr<content::WebContents> WebView::SwapWebContents(
- scoped_ptr<content::WebContents> new_web_contents) {
+std::unique_ptr<content::WebContents> WebView::SwapWebContents(
+ std::unique_ptr<content::WebContents> new_web_contents) {
if (wc_owner_)
wc_owner_->SetDelegate(NULL);
- scoped_ptr<content::WebContents> old_web_contents(std::move(wc_owner_));
+ std::unique_ptr<content::WebContents> old_web_contents(std::move(wc_owner_));
wc_owner_ = std::move(new_web_contents);
if (wc_owner_)
wc_owner_->SetDelegate(this);
« no previous file with comments | « ui/views/controls/webview/webview.h ('k') | ui/views/controls/webview/webview_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698