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 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
333 module_ref_count_--; | 333 module_ref_count_--; |
334 if (0 == module_ref_count_) { | 334 if (0 == module_ref_count_) { |
335 CHECK(MessageLoop::current()->is_running()); | 335 CHECK(MessageLoop::current()->is_running()); |
336 // Allow UI and IO threads to do blocking IO on shutdown, since we do a lot | 336 // Allow UI and IO threads to do blocking IO on shutdown, since we do a lot |
337 // of it on shutdown for valid reasons. | 337 // of it on shutdown for valid reasons. |
338 base::ThreadRestrictions::SetIOAllowed(true); | 338 base::ThreadRestrictions::SetIOAllowed(true); |
339 CHECK(!BrowserList::GetLastActive()); | 339 CHECK(!BrowserList::GetLastActive()); |
340 BrowserThread::PostTask( | 340 BrowserThread::PostTask( |
341 BrowserThread::IO, | 341 BrowserThread::IO, |
342 FROM_HERE, | 342 FROM_HERE, |
343 base::IgnoreReturn<bool>( | 343 base::Bind(base::IgnoreResult(&base::ThreadRestrictions::SetIOAllowed), |
344 base::Bind(&base::ThreadRestrictions::SetIOAllowed, true))); | 344 true)); |
345 | 345 |
346 #if defined(OS_MACOSX) | 346 #if defined(OS_MACOSX) |
347 MessageLoop::current()->PostTask( | 347 MessageLoop::current()->PostTask( |
348 FROM_HERE, | 348 FROM_HERE, |
349 base::Bind(ChromeBrowserMainPartsMac::DidEndMainMessageLoop)); | 349 base::Bind(ChromeBrowserMainPartsMac::DidEndMainMessageLoop)); |
350 #endif | 350 #endif |
351 MessageLoop::current()->Quit(); | 351 MessageLoop::current()->Quit(); |
352 } | 352 } |
353 return module_ref_count_; | 353 return module_ref_count_; |
354 } | 354 } |
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
990 } | 990 } |
991 | 991 |
992 void BrowserProcessImpl::OnAutoupdateTimer() { | 992 void BrowserProcessImpl::OnAutoupdateTimer() { |
993 if (CanAutorestartForUpdate()) { | 993 if (CanAutorestartForUpdate()) { |
994 DLOG(WARNING) << "Detected update. Restarting browser."; | 994 DLOG(WARNING) << "Detected update. Restarting browser."; |
995 RestartBackgroundInstance(); | 995 RestartBackgroundInstance(); |
996 } | 996 } |
997 } | 997 } |
998 | 998 |
999 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 999 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |