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 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
528 // http://crbug.com/318527. | 529 // http://crbug.com/318527. |
529 rundown_counter->TimedWait( | 530 rundown_counter->TimedWait( |
530 base::TimeDelta::FromSeconds(kEndSessionTimeoutSeconds)); | 531 base::TimeDelta::FromSeconds(kEndSessionTimeoutSeconds)); |
531 #else | 532 #else |
532 NOTIMPLEMENTED(); | 533 NOTIMPLEMENTED(); |
533 #endif | 534 #endif |
534 } | 535 } |
535 | 536 |
536 MetricsServicesManager* BrowserProcessImpl::GetMetricsServicesManager() { | 537 MetricsServicesManager* BrowserProcessImpl::GetMetricsServicesManager() { |
537 DCHECK(CalledOnValidThread()); | 538 DCHECK(CalledOnValidThread()); |
538 if (!metrics_services_manager_) | 539 if (!metrics_services_manager_) { |
539 metrics_services_manager_.reset(new MetricsServicesManager(local_state())); | 540 metrics_services_manager_.reset(new MetricsServicesManager(make_scoped_ptr( |
| 541 new ChromeMetricsServicesManagerClient(local_state())))); |
| 542 } |
540 return metrics_services_manager_.get(); | 543 return metrics_services_manager_.get(); |
541 } | 544 } |
542 | 545 |
543 metrics::MetricsService* BrowserProcessImpl::metrics_service() { | 546 metrics::MetricsService* BrowserProcessImpl::metrics_service() { |
544 DCHECK(CalledOnValidThread()); | 547 DCHECK(CalledOnValidThread()); |
545 return GetMetricsServicesManager()->GetMetricsService(); | 548 return GetMetricsServicesManager()->GetMetricsService(); |
546 } | 549 } |
547 | 550 |
548 rappor::RapporService* BrowserProcessImpl::rappor_service() { | 551 rappor::RapporService* BrowserProcessImpl::rappor_service() { |
549 DCHECK(CalledOnValidThread()); | 552 DCHECK(CalledOnValidThread()); |
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1280 } | 1283 } |
1281 | 1284 |
1282 void BrowserProcessImpl::OnAutoupdateTimer() { | 1285 void BrowserProcessImpl::OnAutoupdateTimer() { |
1283 if (CanAutorestartForUpdate()) { | 1286 if (CanAutorestartForUpdate()) { |
1284 DLOG(WARNING) << "Detected update. Restarting browser."; | 1287 DLOG(WARNING) << "Detected update. Restarting browser."; |
1285 RestartBackgroundInstance(); | 1288 RestartBackgroundInstance(); |
1286 } | 1289 } |
1287 } | 1290 } |
1288 | 1291 |
1289 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1292 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |