summaryrefslogtreecommitdiff
path: root/www/iridium/files/patch-chrome_browser_browser__process__impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/iridium/files/patch-chrome_browser_browser__process__impl.cc')
-rw-r--r--www/iridium/files/patch-chrome_browser_browser__process__impl.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc
index b5a9b406b9b6..bae35a6d02aa 100644
--- a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc
@@ -1,20 +1,20 @@
---- chrome/browser/browser_process_impl.cc.orig 2017-04-19 19:06:29 UTC
-+++ chrome/browser/browser_process_impl.cc
-@@ -171,7 +171,7 @@
+--- chrome/browser/browser_process_impl.cc.orig 2018-06-13 00:10:04.000000000 +0200
++++ chrome/browser/browser_process_impl.cc 2018-07-14 13:27:02.197056000 +0200
+@@ -180,7 +180,7 @@
#include "chrome/browser/media/webrtc/webrtc_log_uploader.h"
#endif
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- #include "chrome/browser/memory/tab_manager.h"
+ #include "chrome/browser/resource_coordinator/tab_manager.h"
#endif
-@@ -789,7 +789,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_
+@@ -856,7 +856,7 @@
- memory::TabManager* BrowserProcessImpl::GetTabManager() {
- DCHECK(CalledOnValidThread());
+ resource_coordinator::TabManager* BrowserProcessImpl::GetTabManager() {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- if (!tab_manager_.get())
- tab_manager_.reset(new memory::TabManager());
- return tab_manager_.get();
+ if (!tab_manager_) {
+ tab_manager_ = std::make_unique<resource_coordinator::TabManager>();
+ tab_lifecycle_unit_source_ =