chromium/trunk/download-bubble-typename.patch

   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
  17  template <typename Id, typename Item>
  18 -SortedItems<Item>::iterator
  19 +typename SortedItems<Item>::iterator
  20  DownloadBubbleUpdateService::RemoveItemFromCacheByIter(
  21 -    SortedItems<Item>::iterator iter,
  22 +    typename SortedItems<Item>::iterator iter,
  23      SortedItems<Item>& cache,
  24      IterMap<Id, Item>& iter_map) {
  25    CHECK(iter != cache.end());
  26 diff --git a/chrome/browser/download/bubble/download_bubble_update_service.h b/chrome/browser/download/bubble/download_bubble_update_service.h
  27 index 4c3c0bc1193..38048873aa9 100644
  28 --- a/chrome/browser/download/bubble/download_bubble_update_service.h
  29 +++ b/chrome/browser/download/bubble/download_bubble_update_service.h
  30 @@ -179,8 +179,8 @@ class DownloadBubbleUpdateService
  31
  32    // Removes item if we already have the iterator to it. Returns next iterator.
  33    template <typename Id, typename Item>
  34 -  SortedItems<Item>::iterator RemoveItemFromCacheByIter(
  35 -      SortedItems<Item>::iterator iter,
  36 +  typename SortedItems<Item>::iterator RemoveItemFromCacheByIter(
  37 +      typename SortedItems<Item>::iterator iter,
  38        SortedItems<Item>& cache,
  39        IterMap<Id, Item>& iter_map);
  40