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

Unified Diff: chrome/browser/android/offline_pages/prerendering_offliner.cc

Issue 2048923002: Fixes for turning on offliner request. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Put const& back on LoadPageCallback param Created 4 years, 6 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 | « chrome/browser/android/offline_pages/prerendering_offliner.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/offline_pages/prerendering_offliner.cc
diff --git a/chrome/browser/android/offline_pages/prerendering_offliner.cc b/chrome/browser/android/offline_pages/prerendering_offliner.cc
index c7aab9e3f0953753e0a030325936f988c4e0c3fc..35e2168398ffa4ea2da5a1a64509f29e9939d267 100644
--- a/chrome/browser/android/offline_pages/prerendering_offliner.cc
+++ b/chrome/browser/android/offline_pages/prerendering_offliner.cc
@@ -58,7 +58,7 @@ void PrerenderingOffliner::OnLoadPageDone(
completion_callback));
} else {
// Clear pending request and then run the completion callback.
- pending_request_ = nullptr;
+ pending_request_.reset(nullptr);
completion_callback.Run(request, load_status);
}
}
@@ -80,7 +80,7 @@ void PrerenderingOffliner::OnSavePageDone(
}
// Clear pending request here and inform loader we are done with WebContents.
- pending_request_ = nullptr;
+ pending_request_.reset(nullptr);
GetOrCreateLoader()->StopLoading();
// Determine status and run the completion callback.
@@ -112,8 +112,8 @@ bool PrerenderingOffliner::LoadAndSave(const SavePageRequest& request,
return false;
}
- // Track pending request for callback handling.
- pending_request_ = &request;
+ // Track copy of pending request for callback handling.
+ pending_request_.reset(new SavePageRequest(request));
// Kick off load page attempt.
bool accepted = GetOrCreateLoader()->LoadPage(
@@ -121,14 +121,14 @@ bool PrerenderingOffliner::LoadAndSave(const SavePageRequest& request,
base::Bind(&PrerenderingOffliner::OnLoadPageDone,
weak_ptr_factory_.GetWeakPtr(), request, callback));
if (!accepted)
- pending_request_ = nullptr;
+ pending_request_.reset(nullptr);
return accepted;
}
void PrerenderingOffliner::Cancel() {
if (pending_request_) {
- pending_request_ = nullptr;
+ pending_request_.reset(nullptr);
GetOrCreateLoader()->StopLoading();
// TODO(dougarnett): Consider ability to cancel SavePage request.
}
« no previous file with comments | « chrome/browser/android/offline_pages/prerendering_offliner.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698