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

Side by Side Diff: chrome/browser/android/offline_pages/prerendering_offliner.cc

Issue 2656713002: Merge to M57: Remove popup overlay from MHTML when requested (Closed)
Patch Set: Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/android/offline_pages/prerendering_offliner.h" 5 #include "chrome/browser/android/offline_pages/prerendering_offliner.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/metrics/histogram_macros.h" 8 #include "base/metrics/histogram_macros.h"
9 #include "base/sys_info.h" 9 #include "base/sys_info.h"
10 #include "chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h" 10 #include "chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 // callback or a CANCELED load callback (triggered because the loaded 57 // callback or a CANCELED load callback (triggered because the loaded
58 // WebContents are being destroyed) - whichever callback occurs first. 58 // WebContents are being destroyed) - whichever callback occurs first.
59 DCHECK(web_contents); 59 DCHECK(web_contents);
60 std::unique_ptr<OfflinePageArchiver> archiver( 60 std::unique_ptr<OfflinePageArchiver> archiver(
61 new OfflinePageMHTMLArchiver(web_contents)); 61 new OfflinePageMHTMLArchiver(web_contents));
62 62
63 OfflinePageModel::SavePageParams save_page_params; 63 OfflinePageModel::SavePageParams save_page_params;
64 save_page_params.url = web_contents->GetLastCommittedURL(); 64 save_page_params.url = web_contents->GetLastCommittedURL();
65 save_page_params.client_id = request.client_id(); 65 save_page_params.client_id = request.client_id();
66 save_page_params.proposed_offline_id = request.request_id(); 66 save_page_params.proposed_offline_id = request.request_id();
67 save_page_params.is_background = true;
67 // Pass in the original URL if it is different from the last committed URL 68 // Pass in the original URL if it is different from the last committed URL
68 // when redirects occur. 69 // when redirects occur.
69 if (save_page_params.url != request.url()) 70 if (save_page_params.url != request.url())
70 save_page_params.original_url = request.url(); 71 save_page_params.original_url = request.url();
71 72
72 SavePage(save_page_params, std::move(archiver), 73 SavePage(save_page_params, std::move(archiver),
73 base::Bind(&PrerenderingOffliner::OnSavePageDone, 74 base::Bind(&PrerenderingOffliner::OnSavePageDone,
74 weak_ptr_factory_.GetWeakPtr(), request)); 75 weak_ptr_factory_.GetWeakPtr(), request));
75 } else { 76 } else {
76 // Clear pending request and app listener then run completion callback. 77 // Clear pending request and app listener then run completion callback.
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES) { 238 base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES) {
238 DVLOG(1) << "App became active, canceling current offlining request"; 239 DVLOG(1) << "App became active, canceling current offlining request";
239 SavePageRequest* request = pending_request_.get(); 240 SavePageRequest* request = pending_request_.get();
240 Cancel(); 241 Cancel();
241 completion_callback_.Run(*request, 242 completion_callback_.Run(*request,
242 Offliner::RequestStatus::FOREGROUND_CANCELED); 243 Offliner::RequestStatus::FOREGROUND_CANCELED);
243 } 244 }
244 } 245 }
245 246
246 } // namespace offline_pages 247 } // namespace offline_pages
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698