mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Destroy icon manager after file thread is destroyed

Browse source
This commit is contained in:
deepak1556 2017-02-17 14:03:46 +05:30
parent 977abc6458
commit 5687f8b3b7
4 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/api/atom_api_app.h
View file

@ -130,8 +130,6 @@ class App : public AtomBrowserClient::Delegate,
void DisableHardwareAcceleration(mate::Arguments* args);
bool IsAccessibilitySupportEnabled();
Browser::LoginItemSettings GetLoginItemSettings(mate::Arguments* args);
base::CancelableTaskTracker cancelable_task_tracker_;
std::unique_ptr<IconManager> icon_manager_;
#if defined(USE_NSS_CERTS)
void ImportCertificate(const base::DictionaryValue& options,
const net::CompletionCallback& callback);
@ -153,6 +151,9 @@ class App : public AtomBrowserClient::Delegate,
std::unique_ptr<CertificateManagerModel> certificate_manager_model_;
#endif
// Tracks tasks requesting file icons.
base::CancelableTaskTracker cancelable_task_tracker_;
DISALLOW_COPY_AND_ASSIGN(App);
};