OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/browser_process_impl.h" | 5 #include "chrome/browser/browser_process_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
278 resource_dispatcher_host_.reset(); | 278 resource_dispatcher_host_.reset(); |
279 | 279 |
280 // Wait for the pending print jobs to finish. | 280 // Wait for the pending print jobs to finish. |
281 print_job_manager_->OnQuit(); | 281 print_job_manager_->OnQuit(); |
282 print_job_manager_.reset(); | 282 print_job_manager_.reset(); |
283 | 283 |
284 // Destroy TabCloseableStateWatcher before NotificationService since the | 284 // Destroy TabCloseableStateWatcher before NotificationService since the |
285 // former registers for notifications. | 285 // former registers for notifications. |
286 tab_closeable_state_watcher_.reset(); | 286 tab_closeable_state_watcher_.reset(); |
287 | 287 |
| 288 tracked_objects::ThreadData::EnsureCleanupWasCalled(4); |
| 289 |
288 g_browser_process = NULL; | 290 g_browser_process = NULL; |
289 } | 291 } |
290 | 292 |
291 #if defined(OS_WIN) | 293 #if defined(OS_WIN) |
292 // Send a QuitTask to the given MessageLoop when the (file) thread has processed | 294 // Send a QuitTask to the given MessageLoop when the (file) thread has processed |
293 // our (other) recent requests (to save preferences). | 295 // our (other) recent requests (to save preferences). |
294 // Change the boolean so that the receiving thread will know that we did indeed | 296 // Change the boolean so that the receiving thread will know that we did indeed |
295 // send the QuitTask that terminated the message loop. | 297 // send the QuitTask that terminated the message loop. |
296 static void PostQuit(MessageLoop* message_loop) { | 298 static void PostQuit(MessageLoop* message_loop) { |
297 g_end_session_file_thread_has_completed = true; | 299 g_end_session_file_thread_has_completed = true; |
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1086 } | 1088 } |
1087 | 1089 |
1088 void BrowserProcessImpl::OnAutoupdateTimer() { | 1090 void BrowserProcessImpl::OnAutoupdateTimer() { |
1089 if (CanAutorestartForUpdate()) { | 1091 if (CanAutorestartForUpdate()) { |
1090 DLOG(WARNING) << "Detected update. Restarting browser."; | 1092 DLOG(WARNING) << "Detected update. Restarting browser."; |
1091 RestartBackgroundInstance(); | 1093 RestartBackgroundInstance(); |
1092 } | 1094 } |
1093 } | 1095 } |
1094 | 1096 |
1095 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1097 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |