download-bubble-typename.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
  2. index 13460309d0e..a18d2f8a272 100644
  3. --- a/chrome/browser/download/bubble/download_bubble_update_service.cc
  4. +++ b/chrome/browser/download/bubble/download_bubble_update_service.cc
  5. @@ -87,7 +87,7 @@ ItemSortKey GetSortKey(const Item& item) {
  6. // Helper to get an iterator to the last element in the cache. The cache
  7. // must not be empty.
  8. template <typename Item>
  9. -SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
  10. +typename SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
  11. CHECK(!cache.empty());
  12. auto it = cache.end();
  13. return std::prev(it);
  14. @@ -656,9 +656,9 @@ bool DownloadBubbleUpdateService::RemoveItemFromCacheImpl(
  15. }
  16. template <typename Id, typename Item>
  17. -SortedItems<Item>::iterator
  18. +typename SortedItems<Item>::iterator
  19. DownloadBubbleUpdateService::RemoveItemFromCacheByIter(
  20. - SortedItems<Item>::iterator iter,
  21. + typename SortedItems<Item>::iterator iter,
  22. SortedItems<Item>& cache,
  23. IterMap<Id, Item>& iter_map) {
  24. CHECK(iter != cache.end());
  25. diff --git a/chrome/browser/download/bubble/download_bubble_update_service.h b/chrome/browser/download/bubble/download_bubble_update_service.h
  26. index 4c3c0bc1193..38048873aa9 100644
  27. --- a/chrome/browser/download/bubble/download_bubble_update_service.h
  28. +++ b/chrome/browser/download/bubble/download_bubble_update_service.h
  29. @@ -179,8 +179,8 @@ class DownloadBubbleUpdateService
  30. // Removes item if we already have the iterator to it. Returns next iterator.
  31. template <typename Id, typename Item>
  32. - SortedItems<Item>::iterator RemoveItemFromCacheByIter(
  33. - SortedItems<Item>::iterator iter,
  34. + typename SortedItems<Item>::iterator RemoveItemFromCacheByIter(
  35. + typename SortedItems<Item>::iterator iter,
  36. SortedItems<Item>& cache,
  37. IterMap<Id, Item>& iter_map);