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 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
740 if (!webrtc_log_uploader_.get()) | 740 if (!webrtc_log_uploader_.get()) |
741 webrtc_log_uploader_.reset(new WebRtcLogUploader()); | 741 webrtc_log_uploader_.reset(new WebRtcLogUploader()); |
742 return webrtc_log_uploader_.get(); | 742 return webrtc_log_uploader_.get(); |
743 } | 743 } |
744 #endif | 744 #endif |
745 | 745 |
746 network_time::NetworkTimeTracker* BrowserProcessImpl::network_time_tracker() { | 746 network_time::NetworkTimeTracker* BrowserProcessImpl::network_time_tracker() { |
747 if (!network_time_tracker_) { | 747 if (!network_time_tracker_) { |
748 network_time_tracker_.reset(new network_time::NetworkTimeTracker( | 748 network_time_tracker_.reset(new network_time::NetworkTimeTracker( |
749 base::WrapUnique(new base::DefaultClock()), | 749 base::WrapUnique(new base::DefaultClock()), |
750 base::WrapUnique(new base::DefaultTickClock()), local_state())); | 750 base::WrapUnique(new base::DefaultTickClock()), local_state(), |
| 751 io_thread()->system_url_request_context_getter())); |
751 } | 752 } |
752 return network_time_tracker_.get(); | 753 return network_time_tracker_.get(); |
753 } | 754 } |
754 | 755 |
755 gcm::GCMDriver* BrowserProcessImpl::gcm_driver() { | 756 gcm::GCMDriver* BrowserProcessImpl::gcm_driver() { |
756 DCHECK(CalledOnValidThread()); | 757 DCHECK(CalledOnValidThread()); |
757 if (!gcm_driver_) | 758 if (!gcm_driver_) |
758 CreateGCMDriver(); | 759 CreateGCMDriver(); |
759 return gcm_driver_.get(); | 760 return gcm_driver_.get(); |
760 } | 761 } |
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1311 } | 1312 } |
1312 | 1313 |
1313 void BrowserProcessImpl::OnAutoupdateTimer() { | 1314 void BrowserProcessImpl::OnAutoupdateTimer() { |
1314 if (CanAutorestartForUpdate()) { | 1315 if (CanAutorestartForUpdate()) { |
1315 DLOG(WARNING) << "Detected update. Restarting browser."; | 1316 DLOG(WARNING) << "Detected update. Restarting browser."; |
1316 RestartBackgroundInstance(); | 1317 RestartBackgroundInstance(); |
1317 } | 1318 } |
1318 } | 1319 } |
1319 | 1320 |
1320 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1321 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |