| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 : created_watchdog_thread_(false), | 147 : created_watchdog_thread_(false), |
| 148 created_browser_policy_connector_(false), | 148 created_browser_policy_connector_(false), |
| 149 created_profile_manager_(false), | 149 created_profile_manager_(false), |
| 150 created_local_state_(false), | 150 created_local_state_(false), |
| 151 created_icon_manager_(false), | 151 created_icon_manager_(false), |
| 152 created_notification_ui_manager_(false), | 152 created_notification_ui_manager_(false), |
| 153 created_safe_browsing_service_(false), | 153 created_safe_browsing_service_(false), |
| 154 module_ref_count_(0), | 154 module_ref_count_(0), |
| 155 did_start_(false), | 155 did_start_(false), |
| 156 download_status_updater_(new DownloadStatusUpdater), | 156 download_status_updater_(new DownloadStatusUpdater), |
| 157 local_state_task_runner_(local_state_task_runner), | 157 local_state_task_runner_(local_state_task_runner) { |
| 158 network_time_tracker_(new NetworkTimeTracker( | |
| 159 scoped_ptr<base::TickClock>(new base::DefaultTickClock()))) { | |
| 160 g_browser_process = this; | 158 g_browser_process = this; |
| 161 platform_part_.reset(new BrowserProcessPlatformPart()); | 159 platform_part_.reset(new BrowserProcessPlatformPart()); |
| 162 | 160 |
| 163 #if defined(ENABLE_PRINTING) | 161 #if defined(ENABLE_PRINTING) |
| 164 // Must be created after the NotificationService. | 162 // Must be created after the NotificationService. |
| 165 print_job_manager_.reset(new printing::PrintJobManager); | 163 print_job_manager_.reset(new printing::PrintJobManager); |
| 166 #endif | 164 #endif |
| 167 | 165 |
| 168 net_log_.reset(new ChromeNetLog); | 166 net_log_.reset(new ChromeNetLog); |
| 169 | 167 |
| (...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 614 | 612 |
| 615 #if defined(ENABLE_WEBRTC) | 613 #if defined(ENABLE_WEBRTC) |
| 616 WebRtcLogUploader* BrowserProcessImpl::webrtc_log_uploader() { | 614 WebRtcLogUploader* BrowserProcessImpl::webrtc_log_uploader() { |
| 617 if (!webrtc_log_uploader_.get()) | 615 if (!webrtc_log_uploader_.get()) |
| 618 webrtc_log_uploader_.reset(new WebRtcLogUploader()); | 616 webrtc_log_uploader_.reset(new WebRtcLogUploader()); |
| 619 return webrtc_log_uploader_.get(); | 617 return webrtc_log_uploader_.get(); |
| 620 } | 618 } |
| 621 #endif | 619 #endif |
| 622 | 620 |
| 623 NetworkTimeTracker* BrowserProcessImpl::network_time_tracker() { | 621 NetworkTimeTracker* BrowserProcessImpl::network_time_tracker() { |
| 622 if (!network_time_tracker_) { |
| 623 network_time_tracker_.reset(new NetworkTimeTracker( |
| 624 scoped_ptr<base::TickClock>(new base::DefaultTickClock()), |
| 625 local_state())); |
| 626 } |
| 624 return network_time_tracker_.get(); | 627 return network_time_tracker_.get(); |
| 625 } | 628 } |
| 626 | 629 |
| 627 // static | 630 // static |
| 628 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { | 631 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { |
| 629 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, | 632 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, |
| 630 false); | 633 false); |
| 631 // This policy needs to be defined before the net subsystem is initialized, | 634 // This policy needs to be defined before the net subsystem is initialized, |
| 632 // so we do it here. | 635 // so we do it here. |
| 633 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, | 636 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, |
| (...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1048 } | 1051 } |
| 1049 | 1052 |
| 1050 void BrowserProcessImpl::OnAutoupdateTimer() { | 1053 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1051 if (CanAutorestartForUpdate()) { | 1054 if (CanAutorestartForUpdate()) { |
| 1052 DLOG(WARNING) << "Detected update. Restarting browser."; | 1055 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1053 RestartBackgroundInstance(); | 1056 RestartBackgroundInstance(); |
| 1054 } | 1057 } |
| 1055 } | 1058 } |
| 1056 | 1059 |
| 1057 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1060 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |