diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-24 11:30:15 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-30 12:56:19 +0000 |
commit | 6036726eb981b6c4b42047513b9d3f4ac865daac (patch) | |
tree | 673593e70678e7789766d1f732eb51f613a2703b /chromium/components/sessions | |
parent | 466052c4e7c052268fd931888cd58961da94c586 (diff) | |
download | qtwebengine-chromium-6036726eb981b6c4b42047513b9d3f4ac865daac.tar.gz |
BASELINE: Update Chromium to 70.0.3538.78
Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/sessions')
-rw-r--r-- | chromium/components/sessions/core/base_session_service.cc | 4 | ||||
-rw-r--r-- | chromium/components/sessions/core/tab_restore_service_helper.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chromium/components/sessions/core/base_session_service.cc b/chromium/components/sessions/core/base_session_service.cc index df7d44bb09e..8a5108c3999 100644 --- a/chromium/components/sessions/core/base_session_service.cc +++ b/chromium/components/sessions/core/base_session_service.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/location.h" #include "base/sequenced_task_runner.h" -#include "base/task_scheduler/post_task.h" +#include "base/task/post_task.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" #include "components/sessions/core/base_session_service_delegate.h" @@ -123,7 +123,7 @@ void BaseSessionService::StartSaveTimer() { base::ThreadTaskRunnerHandle::IsSet() && !weak_factory_.HasWeakPtrs()) { base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( FROM_HERE, - base::Bind(&BaseSessionService::Save, weak_factory_.GetWeakPtr()), + base::BindOnce(&BaseSessionService::Save, weak_factory_.GetWeakPtr()), base::TimeDelta::FromMilliseconds(kSaveDelayMS)); } } diff --git a/chromium/components/sessions/core/tab_restore_service_helper.h b/chromium/components/sessions/core/tab_restore_service_helper.h index 4372d8d89c2..afae972885a 100644 --- a/chromium/components/sessions/core/tab_restore_service_helper.h +++ b/chromium/components/sessions/core/tab_restore_service_helper.h @@ -194,7 +194,7 @@ class SESSIONS_EXPORT TabRestoreServiceHelper // historical tab. bool restoring_; - base::ObserverList<TabRestoreServiceObserver> observer_list_; + base::ObserverList<TabRestoreServiceObserver>::Unchecked observer_list_; // Set of contexts that we've received a BrowserClosing method for but no // corresponding BrowserClosed. We cache the set of contexts closing to |