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

Unified Diff: chrome/browser/browsing_data/browsing_data_remover.cc

Issue 1420003004: Wipe out offline page data on clearing cookie and site data (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests Created 5 years, 2 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: chrome/browser/browsing_data/browsing_data_remover.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index 7f08d3c4805cbb30fb96d74a7e3e3d8e73acfec8..f238c73d5d5fa4346c9f1f860aea961c642f5063 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -77,8 +77,11 @@
#include "url/origin.h"
#if defined(OS_ANDROID)
+#include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
#include "chrome/browser/android/webapps/webapp_registry.h"
#include "chrome/browser/precache/precache_manager_factory.h"
+#include "components/offline_pages/offline_page_feature.h"
+#include "components/offline_pages/offline_page_model.h"
#include "components/precache/content/precache_manager.h"
#endif
@@ -788,6 +791,14 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
base::Bind(&BrowsingDataRemover::OnClearedWebappData,
base::Unretained(this)));
}
+
+ if ((remove_mask & REMOVE_OFFLINE_PAGE_DATA) &&
+ offline_pages::IsOfflinePagesEnabled()) {
+ waiting_for_clear_offline_page_data_ = true;
+ offline_pages::OfflinePageModelFactory::GetForBrowserContext(profile_)->
+ ClearAll(base::Bind(&BrowsingDataRemover::OnClearedOfflinePageData,
+ base::Unretained(this)));
+ }
#endif
// Record the combined deletion of cookies and cache.
@@ -871,6 +882,7 @@ bool BrowsingDataRemover::AllDone() {
#if defined(OS_ANDROID)
!waiting_for_clear_precache_history_ &&
!waiting_for_clear_webapp_data_ &&
+ !waiting_for_clear_offline_page_data_ &&
#endif
#if defined(ENABLE_WEBRTC)
!waiting_for_clear_webrtc_logs_ &&
@@ -1169,6 +1181,12 @@ void BrowsingDataRemover::OnClearedWebappData() {
waiting_for_clear_webapp_data_ = false;
NotifyAndDeleteIfDone();
}
+
+void BrowsingDataRemover::OnClearedOfflinePageData() {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ waiting_for_clear_offline_page_data_ = false;
+ NotifyAndDeleteIfDone();
+}
#endif
void BrowsingDataRemover::OnClearedDomainReliabilityMonitor() {

Powered by Google App Engine
This is Rietveld 408576698