| 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 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 757 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 768 if (!webrtc_log_uploader_.get()) | 768 if (!webrtc_log_uploader_.get()) |
| 769 webrtc_log_uploader_.reset(new WebRtcLogUploader()); | 769 webrtc_log_uploader_.reset(new WebRtcLogUploader()); |
| 770 return webrtc_log_uploader_.get(); | 770 return webrtc_log_uploader_.get(); |
| 771 } | 771 } |
| 772 #endif | 772 #endif |
| 773 | 773 |
| 774 network_time::NetworkTimeTracker* BrowserProcessImpl::network_time_tracker() { | 774 network_time::NetworkTimeTracker* BrowserProcessImpl::network_time_tracker() { |
| 775 if (!network_time_tracker_) { | 775 if (!network_time_tracker_) { |
| 776 network_time_tracker_.reset(new network_time::NetworkTimeTracker( | 776 network_time_tracker_.reset(new network_time::NetworkTimeTracker( |
| 777 make_scoped_ptr(new base::DefaultClock()), | 777 make_scoped_ptr(new base::DefaultClock()), |
| 778 make_scoped_ptr(new base::DefaultTickClock()), | 778 make_scoped_ptr(new base::DefaultTickClock()), local_state(), |
| 779 local_state())); | 779 io_thread()->system_url_request_context_getter())); |
| 780 } | 780 } |
| 781 return network_time_tracker_.get(); | 781 return network_time_tracker_.get(); |
| 782 } | 782 } |
| 783 | 783 |
| 784 gcm::GCMDriver* BrowserProcessImpl::gcm_driver() { | 784 gcm::GCMDriver* BrowserProcessImpl::gcm_driver() { |
| 785 DCHECK(CalledOnValidThread()); | 785 DCHECK(CalledOnValidThread()); |
| 786 if (!gcm_driver_) | 786 if (!gcm_driver_) |
| 787 CreateGCMDriver(); | 787 CreateGCMDriver(); |
| 788 return gcm_driver_.get(); | 788 return gcm_driver_.get(); |
| 789 } | 789 } |
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1295 } | 1295 } |
| 1296 | 1296 |
| 1297 void BrowserProcessImpl::OnAutoupdateTimer() { | 1297 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1298 if (CanAutorestartForUpdate()) { | 1298 if (CanAutorestartForUpdate()) { |
| 1299 DLOG(WARNING) << "Detected update. Restarting browser."; | 1299 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1300 RestartBackgroundInstance(); | 1300 RestartBackgroundInstance(); |
| 1301 } | 1301 } |
| 1302 } | 1302 } |
| 1303 | 1303 |
| 1304 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1304 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |