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

Unified Diff: content/browser/frame_host/navigation_request.cc

Issue 1545243002: Convert Pass()→std::move() in //content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « content/browser/frame_host/navigation_handle_impl.cc ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/navigation_request.cc
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index 027ba75898754583eb4776e9d8c522cbd309fb98..f8ab2c2151bf94c7615e3ac2aad9d9283c4466b1 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -4,6 +4,8 @@
#include "content/browser/frame_host/navigation_request.h"
+#include <utility>
+
#include "content/browser/frame_host/frame_tree.h"
#include "content/browser/frame_host/frame_tree_node.h"
#include "content/browser/frame_host/navigation_controller_impl.h"
@@ -107,7 +109,7 @@ scoped_ptr<NavigationRequest> NavigationRequest::CreateBrowserInitiated(
controller->GetLastCommittedEntryIndex(),
controller->GetEntryCount()),
request_body, true, &frame_entry, &entry));
- return navigation_request.Pass();
+ return navigation_request;
}
// static
@@ -143,7 +145,7 @@ scoped_ptr<NavigationRequest> NavigationRequest::CreateRendererInitiated(
scoped_ptr<NavigationRequest> navigation_request(
new NavigationRequest(frame_tree_node, common_params, begin_params,
request_params, body, false, nullptr, nullptr));
- return navigation_request.Pass();
+ return navigation_request;
}
NavigationRequest::NavigationRequest(
@@ -228,7 +230,7 @@ void NavigationRequest::CreateNavigationHandle() {
void NavigationRequest::TransferNavigationHandleOwnership(
RenderFrameHostImpl* render_frame_host) {
- render_frame_host->SetNavigationHandle(navigation_handle_.Pass());
+ render_frame_host->SetNavigationHandle(std::move(navigation_handle_));
}
void NavigationRequest::OnRequestRedirected(
@@ -267,8 +269,8 @@ void NavigationRequest::OnResponseStarted(
->service_worker_provider_host_id();
}
- frame_tree_node_->navigator()->CommitNavigation(frame_tree_node_,
- response.get(), body.Pass());
+ frame_tree_node_->navigator()->CommitNavigation(
+ frame_tree_node_, response.get(), std::move(body));
}
void NavigationRequest::OnRequestFailed(bool has_stale_copy_in_cache,
@@ -300,7 +302,7 @@ void NavigationRequest::OnStartChecksComplete(
InitializeServiceWorkerHandleIfNeeded();
loader_ = NavigationURLLoader::Create(
frame_tree_node_->navigator()->GetController()->GetBrowserContext(),
- info_.Pass(), navigation_handle_->service_worker_handle(), this);
+ std::move(info_), navigation_handle_->service_worker_handle(), this);
}
void NavigationRequest::OnRedirectChecksComplete(
« no previous file with comments | « content/browser/frame_host/navigation_handle_impl.cc ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698