| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 #include "chrome/browser/devtools/remote_debugging_server.h" | 36 #include "chrome/browser/devtools/remote_debugging_server.h" |
| 37 #include "chrome/browser/download/download_request_limiter.h" | 37 #include "chrome/browser/download/download_request_limiter.h" |
| 38 #include "chrome/browser/download/download_status_updater.h" | 38 #include "chrome/browser/download/download_status_updater.h" |
| 39 #include "chrome/browser/gpu/gl_string_manager.h" | 39 #include "chrome/browser/gpu/gl_string_manager.h" |
| 40 #include "chrome/browser/gpu/gpu_mode_manager.h" | 40 #include "chrome/browser/gpu/gpu_mode_manager.h" |
| 41 #include "chrome/browser/icon_manager.h" | 41 #include "chrome/browser/icon_manager.h" |
| 42 #include "chrome/browser/intranet_redirect_detector.h" | 42 #include "chrome/browser/intranet_redirect_detector.h" |
| 43 #include "chrome/browser/io_thread.h" | 43 #include "chrome/browser/io_thread.h" |
| 44 #include "chrome/browser/lifetime/application_lifetime.h" | 44 #include "chrome/browser/lifetime/application_lifetime.h" |
| 45 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" | 45 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
| 46 #include "chrome/browser/metrics/chrome_metrics_services_manager_client.h" |
| 46 #include "chrome/browser/metrics/metrics_services_manager.h" | 47 #include "chrome/browser/metrics/metrics_services_manager.h" |
| 47 #include "chrome/browser/metrics/thread_watcher.h" | 48 #include "chrome/browser/metrics/thread_watcher.h" |
| 48 #include "chrome/browser/net/chrome_net_log_helper.h" | 49 #include "chrome/browser/net/chrome_net_log_helper.h" |
| 49 #include "chrome/browser/net/crl_set_fetcher.h" | 50 #include "chrome/browser/net/crl_set_fetcher.h" |
| 50 #include "chrome/browser/notifications/notification_ui_manager.h" | 51 #include "chrome/browser/notifications/notification_ui_manager.h" |
| 51 #include "chrome/browser/plugins/chrome_plugin_service_filter.h" | 52 #include "chrome/browser/plugins/chrome_plugin_service_filter.h" |
| 52 #include "chrome/browser/plugins/plugin_finder.h" | 53 #include "chrome/browser/plugins/plugin_finder.h" |
| 53 #include "chrome/browser/prefs/browser_prefs.h" | 54 #include "chrome/browser/prefs/browser_prefs.h" |
| 54 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 55 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
| 55 #include "chrome/browser/printing/background_printing_manager.h" | 56 #include "chrome/browser/printing/background_printing_manager.h" |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 // http://crbug.com/318527. | 526 // http://crbug.com/318527. |
| 526 rundown_counter->TimedWait( | 527 rundown_counter->TimedWait( |
| 527 base::TimeDelta::FromSeconds(kEndSessionTimeoutSeconds)); | 528 base::TimeDelta::FromSeconds(kEndSessionTimeoutSeconds)); |
| 528 #else | 529 #else |
| 529 NOTIMPLEMENTED(); | 530 NOTIMPLEMENTED(); |
| 530 #endif | 531 #endif |
| 531 } | 532 } |
| 532 | 533 |
| 533 MetricsServicesManager* BrowserProcessImpl::GetMetricsServicesManager() { | 534 MetricsServicesManager* BrowserProcessImpl::GetMetricsServicesManager() { |
| 534 DCHECK(CalledOnValidThread()); | 535 DCHECK(CalledOnValidThread()); |
| 535 if (!metrics_services_manager_) | 536 if (!metrics_services_manager_) { |
| 536 metrics_services_manager_.reset(new MetricsServicesManager(local_state())); | 537 metrics_services_manager_.reset(new MetricsServicesManager(make_scoped_ptr( |
| 538 new ChromeMetricsServicesManagerClient(local_state())))); |
| 539 } |
| 537 return metrics_services_manager_.get(); | 540 return metrics_services_manager_.get(); |
| 538 } | 541 } |
| 539 | 542 |
| 540 metrics::MetricsService* BrowserProcessImpl::metrics_service() { | 543 metrics::MetricsService* BrowserProcessImpl::metrics_service() { |
| 541 DCHECK(CalledOnValidThread()); | 544 DCHECK(CalledOnValidThread()); |
| 542 return GetMetricsServicesManager()->GetMetricsService(); | 545 return GetMetricsServicesManager()->GetMetricsService(); |
| 543 } | 546 } |
| 544 | 547 |
| 545 rappor::RapporService* BrowserProcessImpl::rappor_service() { | 548 rappor::RapporService* BrowserProcessImpl::rappor_service() { |
| 546 DCHECK(CalledOnValidThread()); | 549 DCHECK(CalledOnValidThread()); |
| (...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1277 } | 1280 } |
| 1278 | 1281 |
| 1279 void BrowserProcessImpl::OnAutoupdateTimer() { | 1282 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1280 if (CanAutorestartForUpdate()) { | 1283 if (CanAutorestartForUpdate()) { |
| 1281 DLOG(WARNING) << "Detected update. Restarting browser."; | 1284 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1282 RestartBackgroundInstance(); | 1285 RestartBackgroundInstance(); |
| 1283 } | 1286 } |
| 1284 } | 1287 } |
| 1285 | 1288 |
| 1286 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1289 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |