Now mark delete notifications for archived URLs specially

chrome/browser/history/expire_history_backend.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/history/expire_history_backend.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
@@ skipping 219 matching lines @@
         (bookmark_service && bookmark_service->IsBookmarked(*url));
 
     DeleteOneURL(url_row, is_bookmarked, &dependencies);
   }
 
   DeleteFaviconsIfPossible(dependencies.affected_favicons);
 
   if (text_db_)
     text_db_->OptimizeChangedDatabases(dependencies.text_db_changes);
 
-  BroadcastDeleteNotifications(&dependencies);
+  BroadcastDeleteNotifications(&dependencies, DELETION_USER_INITIATED);
 }
 
 void ExpireHistoryBackend::ExpireHistoryBetween(
     const std::set<GURL>& restrict_urls, Time begin_time, Time end_time) {
   if (!main_db_)
     return;
 
   // There may be stuff in the text database manager's temporary cache.
   if (text_db_)
     text_db_->DeleteFromUncommitted(restrict_urls, begin_time, end_time);
@@ skipping 25 matching lines @@
   DeleteDependencies dependencies;
   DeleteVisitRelatedInfo(visits, &dependencies);
 
   // Delete or update the URLs affected. We want to update the visit counts
   // since this is called by the user who wants to delete their recent history,
   // and we don't want to leave any evidence.
   ExpireURLsForVisits(visits, &dependencies);
   DeleteFaviconsIfPossible(dependencies.affected_favicons);
 
   // An is_null begin time means that all history should be deleted.
-  BroadcastDeleteNotifications(&dependencies);
+  BroadcastDeleteNotifications(&dependencies, DELETION_USER_INITIATED);
 
   // Pick up any bits possibly left over.
   ParanoidExpireHistory();
 }
 
 void ExpireHistoryBackend::ArchiveHistoryBefore(Time end_time) {
   if (!main_db_)
     return;
 
   // Archive as much history as possible before the given date.
@@ skipping 47 matching lines @@
     return;
 
   for (std::set<FaviconID>::const_iterator i = favicon_set.begin();
        i != favicon_set.end(); ++i) {
     if (!thumb_db_->HasMappingFor(*i))
       thumb_db_->DeleteFavicon(*i);
   }
 }
 
 void ExpireHistoryBackend::BroadcastDeleteNotifications(
-    DeleteDependencies* dependencies) {
+    DeleteDependencies* dependencies, DeletionType type) {
   if (!dependencies->deleted_urls.empty()) {
     // Broadcast the URL deleted notification. Note that we also broadcast when
     // we were requested to delete everything even if that was a NOP, since
     // some components care to know when history is deleted (it's up to them to
     // determine if they care whether anything was deleted).
     URLsDeletedDetails* deleted_details = new URLsDeletedDetails;
     deleted_details->all_history = false;
+    deleted_details->archived = (type == DELETION_ARCHIVED);
     deleted_details->rows = dependencies->deleted_urls;
     delegate_->BroadcastNotifications(
         chrome::NOTIFICATION_HISTORY_URLS_DELETED, deleted_details);
   }
 }
 
 void ExpireHistoryBackend::DeleteVisitRelatedInfo(
     const VisitVector& visits,
     DeleteDependencies* dependencies) {
   for (size_t i = 0; i < visits.size(); i++) {
@@ skipping 286 matching lines @@
            deleted_dependencies.affected_favicons.begin();
        i != deleted_dependencies.affected_favicons.end(); ++i) {
     affected_favicons.insert(*i);
   }
   DeleteFaviconsIfPossible(affected_favicons);
 
   // Send notifications for the stuff that was deleted. These won't normally be
   // in history views since they were subframes, but they will be in the visited
   // link system, which needs to be updated now. This function is smart enough
   // to not do anything if nothing was deleted.
-  BroadcastDeleteNotifications(&deleted_dependencies);
+  BroadcastDeleteNotifications(&deleted_dependencies, DELETION_ARCHIVED);
 
   return more_to_expire;
 }
 
 void ExpireHistoryBackend::ParanoidExpireHistory() {
   // TODO(brettw): Bug 1067331: write this to clean up any errors.
 }
 
 void ExpireHistoryBackend::ScheduleExpireHistoryIndexFiles() {
   if (!text_db_) {
@@ skipping 35 matching lines @@
   // We use the bookmark service to determine if a URL is bookmarked. The
   // bookmark service is loaded on a separate thread and may not be done by the
   // time we get here. We therefor block until the bookmarks have finished
   // loading.
   if (bookmark_service_)
     bookmark_service_->BlockTillLoaded();
   return bookmark_service_;
 }
 
 }  // namespace history