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

Unified Diff: components/offline_pages/offline_page_model_impl.cc

Issue 2067143004: [Offline Pages] Duplicate pages when save/delete bookmarks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moving to model level. 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 | « components/offline_pages/offline_page_model_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/offline_pages/offline_page_model_impl.cc
diff --git a/components/offline_pages/offline_page_model_impl.cc b/components/offline_pages/offline_page_model_impl.cc
index 4d6f1d7af3939455a3ab139c1001cfda815afc1a..585adf684c3112444aecabc6388137b205d71659 100644
--- a/components/offline_pages/offline_page_model_impl.cc
+++ b/components/offline_pages/offline_page_model_impl.cc
@@ -796,6 +796,15 @@ void OfflinePageModelImpl::InformSavePageDone(const SavePageCallback& callback,
ReportSavePageResultHistogramAfterSave(client_id, result);
archive_manager_->GetStorageStats(
base::Bind(&ReportStorageHistogramsAfterSave));
+ // Remove other user initiated pages with same url if the new save request was
+ // user initiated.
+ if (result == SavePageResult::SUCCESS &&
+ OfflinePageModel::IsUserInitiated(client_id)) {
Dmitry Titov 2016/06/16 04:07:15 So far, we seem to gravitate to a model where each
fgorski 2016/06/16 15:05:13 I think we already have the policy object which sh
+ GetPagesByOnlineURL(
+ offline_pages_[offline_id].url,
+ base::Bind(&OfflinePageModelImpl::OnPagesFoundWithSameURL,
+ weak_ptr_factory_.GetWeakPtr(), client_id, offline_id));
+ }
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(&OfflinePageModelImpl::ClearStorageIfNeeded,
weak_ptr_factory_.GetWeakPtr(),
@@ -804,6 +813,28 @@ void OfflinePageModelImpl::InformSavePageDone(const SavePageCallback& callback,
callback.Run(result, offline_id);
}
+void OfflinePageModelImpl::OnPagesFoundWithSameURL(
+ const ClientId& client_id,
+ int64_t offline_id,
+ const MultipleOfflinePageItemResult& items) {
+ std::vector<int64_t> pages_to_delete;
+ for (const auto& item : items) {
+ if (item.offline_id != offline_id &&
+ item.client_id.name_space == client_id.name_space) {
+ pages_to_delete.push_back(item.offline_id);
+ }
+ }
+ DeletePagesByOfflineId(
+ pages_to_delete,
+ base::Bind(&OfflinePageModelImpl::OnDeleteOldPagesWithSameURL,
+ weak_ptr_factory_.GetWeakPtr()));
+}
+
+void OfflinePageModelImpl::OnDeleteOldPagesWithSameURL(
+ DeletePageResult result) {
+ // TODO(romax) Seems like nothing to do here.
Dmitry Titov 2016/06/16 04:07:15 UMA on failures would be interesting.
+}
+
void OfflinePageModelImpl::DeletePendingArchiver(
OfflinePageArchiver* archiver) {
pending_archivers_.erase(std::find(pending_archivers_.begin(),
« no previous file with comments | « components/offline_pages/offline_page_model_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698