OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <map> | 10 #include <map> |
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
519 local_state()))); | 519 local_state()))); |
520 } | 520 } |
521 return metrics_services_manager_.get(); | 521 return metrics_services_manager_.get(); |
522 } | 522 } |
523 | 523 |
524 metrics::MetricsService* BrowserProcessImpl::metrics_service() { | 524 metrics::MetricsService* BrowserProcessImpl::metrics_service() { |
525 DCHECK(CalledOnValidThread()); | 525 DCHECK(CalledOnValidThread()); |
526 return GetMetricsServicesManager()->GetMetricsService(); | 526 return GetMetricsServicesManager()->GetMetricsService(); |
527 } | 527 } |
528 | 528 |
529 rappor::RapporService* BrowserProcessImpl::rappor_service() { | 529 rappor::RapporServiceImpl* BrowserProcessImpl::rappor_service() { |
530 DCHECK(CalledOnValidThread()); | 530 DCHECK(CalledOnValidThread()); |
531 return GetMetricsServicesManager()->GetRapporService(); | 531 return GetMetricsServicesManager()->GetRapporServiceImpl(); |
532 } | 532 } |
533 | 533 |
534 IOThread* BrowserProcessImpl::io_thread() { | 534 IOThread* BrowserProcessImpl::io_thread() { |
535 DCHECK(CalledOnValidThread()); | 535 DCHECK(CalledOnValidThread()); |
536 DCHECK(io_thread_.get()); | 536 DCHECK(io_thread_.get()); |
537 return io_thread_.get(); | 537 return io_thread_.get(); |
538 } | 538 } |
539 | 539 |
540 WatchDogThread* BrowserProcessImpl::watchdog_thread() { | 540 WatchDogThread* BrowserProcessImpl::watchdog_thread() { |
541 DCHECK(CalledOnValidThread()); | 541 DCHECK(CalledOnValidThread()); |
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1403 } | 1403 } |
1404 | 1404 |
1405 void BrowserProcessImpl::OnAutoupdateTimer() { | 1405 void BrowserProcessImpl::OnAutoupdateTimer() { |
1406 if (CanAutorestartForUpdate()) { | 1406 if (CanAutorestartForUpdate()) { |
1407 DLOG(WARNING) << "Detected update. Restarting browser."; | 1407 DLOG(WARNING) << "Detected update. Restarting browser."; |
1408 RestartBackgroundInstance(); | 1408 RestartBackgroundInstance(); |
1409 } | 1409 } |
1410 } | 1410 } |
1411 | 1411 |
1412 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1412 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |