| OLD | NEW |
| 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/history/browsing_history_service.h" | 5 #include "chrome/browser/history/browsing_history_service.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 history::HistoryService* history_service, | 568 history::HistoryService* history_service, |
| 569 bool all_history, | 569 bool all_history, |
| 570 bool expired, | 570 bool expired, |
| 571 const history::URLRows& deleted_rows, | 571 const history::URLRows& deleted_rows, |
| 572 const std::set<GURL>& favicon_urls) { | 572 const std::set<GURL>& favicon_urls) { |
| 573 if (all_history || DeletionsDiffer(deleted_rows, urls_to_be_deleted_)) | 573 if (all_history || DeletionsDiffer(deleted_rows, urls_to_be_deleted_)) |
| 574 handler_->HistoryDeleted(); | 574 handler_->HistoryDeleted(); |
| 575 } | 575 } |
| 576 | 576 |
| 577 void BrowsingHistoryService::OnWebHistoryDeleted() { | 577 void BrowsingHistoryService::OnWebHistoryDeleted() { |
| 578 // TODO(calamity): Only ignore web history deletions when they are actually |
| 579 // initiated by us, rather than ignoring them whenever we are deleting. |
| 578 if (!has_pending_delete_request_) | 580 if (!has_pending_delete_request_) |
| 579 handler_->HistoryDeleted(); | 581 handler_->HistoryDeleted(); |
| 580 } | 582 } |
| OLD | NEW |