| 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 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 500 #else | 500 #else |
| 501 NOTIMPLEMENTED(); | 501 NOTIMPLEMENTED(); |
| 502 #endif | 502 #endif |
| 503 } | 503 } |
| 504 | 504 |
| 505 metrics_services_manager::MetricsServicesManager* | 505 metrics_services_manager::MetricsServicesManager* |
| 506 BrowserProcessImpl::GetMetricsServicesManager() { | 506 BrowserProcessImpl::GetMetricsServicesManager() { |
| 507 DCHECK(CalledOnValidThread()); | 507 DCHECK(CalledOnValidThread()); |
| 508 if (!metrics_services_manager_) { | 508 if (!metrics_services_manager_) { |
| 509 metrics_services_manager_.reset( | 509 metrics_services_manager_.reset( |
| 510 new metrics_services_manager::MetricsServicesManager(base::WrapUnique( | 510 new metrics_services_manager::MetricsServicesManager( |
| 511 new ChromeMetricsServicesManagerClient(local_state())))); | 511 base::MakeUnique<ChromeMetricsServicesManagerClient>( |
| 512 local_state()))); |
| 512 } | 513 } |
| 513 return metrics_services_manager_.get(); | 514 return metrics_services_manager_.get(); |
| 514 } | 515 } |
| 515 | 516 |
| 516 metrics::MetricsService* BrowserProcessImpl::metrics_service() { | 517 metrics::MetricsService* BrowserProcessImpl::metrics_service() { |
| 517 DCHECK(CalledOnValidThread()); | 518 DCHECK(CalledOnValidThread()); |
| 518 return GetMetricsServicesManager()->GetMetricsService(); | 519 return GetMetricsServicesManager()->GetMetricsService(); |
| 519 } | 520 } |
| 520 | 521 |
| 521 rappor::RapporService* BrowserProcessImpl::rappor_service() { | 522 rappor::RapporService* BrowserProcessImpl::rappor_service() { |
| (...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1345 } | 1346 } |
| 1346 | 1347 |
| 1347 void BrowserProcessImpl::OnAutoupdateTimer() { | 1348 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1348 if (CanAutorestartForUpdate()) { | 1349 if (CanAutorestartForUpdate()) { |
| 1349 DLOG(WARNING) << "Detected update. Restarting browser."; | 1350 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1350 RestartBackgroundInstance(); | 1351 RestartBackgroundInstance(); |
| 1351 } | 1352 } |
| 1352 } | 1353 } |
| 1353 | 1354 |
| 1354 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1355 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |