| 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 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 CreateMetricsService(); | 408 CreateMetricsService(); |
| 409 return metrics_service_.get(); | 409 return metrics_service_.get(); |
| 410 } | 410 } |
| 411 | 411 |
| 412 IOThread* BrowserProcessImpl::io_thread() { | 412 IOThread* BrowserProcessImpl::io_thread() { |
| 413 DCHECK(CalledOnValidThread()); | 413 DCHECK(CalledOnValidThread()); |
| 414 DCHECK(io_thread_.get()); | 414 DCHECK(io_thread_.get()); |
| 415 return io_thread_.get(); | 415 return io_thread_.get(); |
| 416 } | 416 } |
| 417 | 417 |
| 418 base::Thread* BrowserProcessImpl::file_user_blocking_thread() { |
| 419 DCHECK(CalledOnValidThread()); |
| 420 return BrowserThread::UnsafeGetBrowserThread( |
| 421 BrowserThread::FILE_USER_BLOCKING); |
| 422 } |
| 423 |
| 418 base::Thread* BrowserProcessImpl::file_thread() { | 424 base::Thread* BrowserProcessImpl::file_thread() { |
| 419 DCHECK(CalledOnValidThread()); | 425 DCHECK(CalledOnValidThread()); |
| 420 return BrowserThread::UnsafeGetBrowserThread(BrowserThread::FILE); | 426 return BrowserThread::UnsafeGetBrowserThread(BrowserThread::FILE); |
| 421 } | 427 } |
| 422 | 428 |
| 423 base::Thread* BrowserProcessImpl::db_thread() { | 429 base::Thread* BrowserProcessImpl::db_thread() { |
| 424 DCHECK(CalledOnValidThread()); | 430 DCHECK(CalledOnValidThread()); |
| 425 return BrowserThread::UnsafeGetBrowserThread(BrowserThread::DB); | 431 return BrowserThread::UnsafeGetBrowserThread(BrowserThread::DB); |
| 426 } | 432 } |
| 427 | 433 |
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1008 } | 1014 } |
| 1009 | 1015 |
| 1010 void BrowserProcessImpl::OnAutoupdateTimer() { | 1016 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1011 if (CanAutorestartForUpdate()) { | 1017 if (CanAutorestartForUpdate()) { |
| 1012 DLOG(WARNING) << "Detected update. Restarting browser."; | 1018 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1013 RestartBackgroundInstance(); | 1019 RestartBackgroundInstance(); |
| 1014 } | 1020 } |
| 1015 } | 1021 } |
| 1016 | 1022 |
| 1017 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1023 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |