Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/browser_shutdown.cc

Issue 6461024: Revert 74292 - Splits ChromeURLDataManager into 2 chunks:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/browser_signin.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_shutdown.cc
===================================================================
--- chrome/browser/browser_shutdown.cc (revision 74293)
+++ chrome/browser/browser_shutdown.cc (working copy)
@@ -257,11 +257,16 @@
file_util::WriteFile(shutdown_ms_file, shutdown_ms.c_str(), len);
}
+ UnregisterURLRequestChromeJob();
+
#if defined(OS_CHROMEOS)
BrowserList::NotifyAndTerminate(false);
#endif
- ChromeURLDataManager::DeleteDataSources();
+ // Clean up data sources before the UI thread is removed.
+ ChromeURLDataManager* data_manager = ChromeURLDataManager::GetInstance();
+ if (data_manager)
+ data_manager->RemoveAllDataSources();
}
void ReadLastShutdownFile(
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/browser_signin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698