You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
3.8 KiB
63 lines
3.8 KiB
2 years ago
|
diff -up chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.cc.me chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.cc
|
||
|
|
--- chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.cc.me 2023-05-03 17:46:37.194000834 +0200
|
||
|
|
+++ chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.cc 2023-05-03 17:48:05.170317575 +0200
|
||
|
|
@@ -87,7 +87,7 @@ ItemSortKey GetSortKey(const Item& item)
|
||
|
|
// Helper to get an iterator to the last element in the cache. The cache
|
||
|
|
// must not be empty.
|
||
|
|
template <typename Item>
|
||
|
|
-SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
|
||
|
|
+typename SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
|
||
|
|
CHECK(!cache.empty());
|
||
|
|
auto it = cache.end();
|
||
|
|
return std::prev(it);
|
||
|
|
@@ -789,9 +789,9 @@ bool DownloadBubbleUpdateService::Remove
|
||
|
|
}
|
||
|
|
|
||
|
|
template <typename Id, typename Item>
|
||
|
|
-SortedItems<Item>::iterator
|
||
|
|
+typename SortedItems<Item>::iterator
|
||
|
|
DownloadBubbleUpdateService::RemoveItemFromCacheByIter(
|
||
|
|
- SortedItems<Item>::iterator iter,
|
||
|
|
+ typename SortedItems<Item>::iterator iter,
|
||
|
|
SortedItems<Item>& cache,
|
||
|
|
IterMap<Id, Item>& iter_map) {
|
||
|
|
CHECK(iter != cache.end());
|
||
|
|
diff -up chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.h.me chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.h
|
||
|
|
--- chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.h.me 2023-05-03 17:48:14.079551820 +0200
|
||
|
|
+++ chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.h 2023-05-03 17:49:24.702387180 +0200
|
||
|
|
@@ -208,8 +208,8 @@ class DownloadBubbleUpdateService
|
||
|
|
|
||
|
|
// Removes item if we already have the iterator to it. Returns next iterator.
|
||
|
|
template <typename Id, typename Item>
|
||
|
|
- SortedItems<Item>::iterator RemoveItemFromCacheByIter(
|
||
|
|
- SortedItems<Item>::iterator iter,
|
||
|
|
+ typename SortedItems<Item>::iterator RemoveItemFromCacheByIter(
|
||
|
|
+ typename SortedItems<Item>::iterator iter,
|
||
|
|
SortedItems<Item>& cache,
|
||
|
|
IterMap<Id, Item>& iter_map);
|
||
|
|
|
||
|
|
diff -up chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.h.me chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.h
|
||
|
|
--- chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.h.me 2023-05-14 00:03:48.455961696 +0200
|
||
|
|
+++ chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.h 2023-05-14 00:04:24.776589164 +0200
|
||
|
|
@@ -587,7 +587,7 @@ class PrintBackendServiceManager {
|
||
|
|
template <class... T>
|
||
|
|
void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
|
||
|
|
const RemoteId& remote_id,
|
||
|
|
- std::remove_reference<T>::type... result);
|
||
|
|
+ typename std::remove_reference<T>::type... result);
|
||
|
|
|
||
|
|
// Test support for client ID management.
|
||
|
|
static void SetClientsForTesting(
|
||
|
|
diff -up chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.cc.me chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.cc
|
||
|
|
--- chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.cc.me 2023-05-14 12:40:29.555926646 +0200
|
||
|
|
+++ chromium-114.0.5735.26/chrome/browser/printing/print_backend_service_manager.cc 2023-05-14 12:41:12.150471791 +0200
|
||
|
|
@@ -1477,7 +1477,7 @@ template <class... T>
|
||
|
|
void PrintBackendServiceManager::RunSavedCallbacks(
|
||
|
|
RemoteSavedCallbacks<T...>& saved_callbacks,
|
||
|
|
const RemoteId& remote_id,
|
||
|
|
- std::remove_reference<T>::type... result) {
|
||
|
|
+ typename std::remove_reference<T>::type... result) {
|
||
|
|
auto found_callbacks_map = saved_callbacks.find(remote_id);
|
||
|
|
if (found_callbacks_map == saved_callbacks.end())
|
||
|
|
return; // No callbacks to run.
|