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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 61d8bf355896c030edd1856e8799235f77226820..37d88b0b19e420f5c9317328983804db93a2e507 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -422,11 +422,11 @@ WebContentsImpl::~WebContentsImpl() {
if (root->pending_frame_host()) {
root->pending_frame_host()->SetRenderFrameCreated(false);
root->pending_frame_host()->SetNavigationHandle(
- scoped_ptr<NavigationHandleImpl>());
+ std::unique_ptr<NavigationHandleImpl>());
}
root->current_frame_host()->SetRenderFrameCreated(false);
root->current_frame_host()->SetNavigationHandle(
- scoped_ptr<NavigationHandleImpl>());
+ std::unique_ptr<NavigationHandleImpl>());
// PlzNavigate: clear up state specific to browser-side navigation.
if (IsBrowserSideNavigationEnabled()) {
@@ -435,7 +435,7 @@ WebContentsImpl::~WebContentsImpl() {
if (root->speculative_frame_host()) {
root->speculative_frame_host()->SetRenderFrameCreated(false);
root->speculative_frame_host()->SetNavigationHandle(
- scoped_ptr<NavigationHandleImpl>());
+ std::unique_ptr<NavigationHandleImpl>());
}
}
@@ -514,7 +514,7 @@ WebContentsImpl* WebContentsImpl::CreateWithOpener(
// static
std::vector<WebContentsImpl*> WebContentsImpl::GetAllWebContents() {
std::vector<WebContentsImpl*> result;
- scoped_ptr<RenderWidgetHostIterator> widgets(
+ std::unique_ptr<RenderWidgetHostIterator> widgets(
RenderWidgetHostImpl::GetRenderWidgetHosts());
while (RenderWidgetHost* rwh = widgets->GetNextHost()) {
RenderViewHost* rvh = RenderViewHost::From(rwh);
@@ -2151,9 +2151,8 @@ void WebContentsImpl::RequestMediaAccessPermission(
if (delegate_) {
delegate_->RequestMediaAccessPermission(this, request, callback);
} else {
- callback.Run(MediaStreamDevices(),
- MEDIA_DEVICE_FAILED_DUE_TO_SHUTDOWN,
- scoped_ptr<MediaStreamUI>());
+ callback.Run(MediaStreamDevices(), MEDIA_DEVICE_FAILED_DUE_TO_SHUTDOWN,
+ std::unique_ptr<MediaStreamUI>());
}
}
@@ -2708,7 +2707,7 @@ void WebContentsImpl::SaveFrameWithHeaders(const GURL& url,
if (entry)
post_id = entry->GetPostID();
}
- scoped_ptr<DownloadUrlParameters> params(
+ std::unique_ptr<DownloadUrlParameters> params(
DownloadUrlParameters::FromWebContents(this, url));
params->set_referrer(referrer);
params->set_post_id(post_id);
@@ -4181,7 +4180,7 @@ void WebContentsImpl::DidStartLoading(FrameTreeNode* frame_tree_node,
}
void WebContentsImpl::DidStopLoading() {
- scoped_ptr<LoadNotificationDetails> details;
+ std::unique_ptr<LoadNotificationDetails> details;
// Use the last committed entry rather than the active one, in case a
// pending entry has been created.
@@ -4585,10 +4584,10 @@ NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() {
return GetController();
}
-scoped_ptr<WebUIImpl> WebContentsImpl::CreateWebUIForRenderFrameHost(
+std::unique_ptr<WebUIImpl> WebContentsImpl::CreateWebUIForRenderFrameHost(
const GURL& url) {
- return scoped_ptr<WebUIImpl>(static_cast<WebUIImpl*>(CreateWebUI(
- url, std::string())));
+ return std::unique_ptr<WebUIImpl>(
+ static_cast<WebUIImpl*>(CreateWebUI(url, std::string())));
}
NavigationEntry*
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/browser/web_contents/web_contents_impl_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698