From c576d442fd173fe35143e7fedd3f8314f91e451d Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Tue, 2 Oct 2018 12:05:51 -0700 Subject: [PATCH] Rename base::Timer to base::TimerBase https://chromium-review.googlesource.com/c/chromium/src/+/1124200 --- atom/browser/atom_browser_main_parts.cc | 1 - atom/browser/atom_browser_main_parts.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/atom/browser/atom_browser_main_parts.cc b/atom/browser/atom_browser_main_parts.cc index 6e217f0cdc..581cd39cd3 100644 --- a/atom/browser/atom_browser_main_parts.cc +++ b/atom/browser/atom_browser_main_parts.cc @@ -73,7 +73,6 @@ AtomBrowserMainParts::AtomBrowserMainParts( browser_(new Browser), node_bindings_(NodeBindings::Create(NodeBindings::BROWSER)), atom_bindings_(new AtomBindings(uv_default_loop())), - gc_timer_(true, true), main_function_params_(params) { DCHECK(!self_) << "Cannot have two AtomBrowserMainParts"; self_ = this; diff --git a/atom/browser/atom_browser_main_parts.h b/atom/browser/atom_browser_main_parts.h index 89d987b454..67334edf4f 100644 --- a/atom/browser/atom_browser_main_parts.h +++ b/atom/browser/atom_browser_main_parts.h @@ -125,7 +125,7 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts { std::unique_ptr net_log_; std::unique_ptr icon_manager_; - base::Timer gc_timer_; + base::RepeatingTimer gc_timer_; // List of callbacks should be executed before destroying JS env. std::list destructors_;