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 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
760 WebRtcLogUploader* BrowserProcessImpl::webrtc_log_uploader() { | 760 WebRtcLogUploader* BrowserProcessImpl::webrtc_log_uploader() { |
761 if (!webrtc_log_uploader_.get()) | 761 if (!webrtc_log_uploader_.get()) |
762 webrtc_log_uploader_.reset(new WebRtcLogUploader()); | 762 webrtc_log_uploader_.reset(new WebRtcLogUploader()); |
763 return webrtc_log_uploader_.get(); | 763 return webrtc_log_uploader_.get(); |
764 } | 764 } |
765 #endif | 765 #endif |
766 | 766 |
767 network_time::NetworkTimeTracker* BrowserProcessImpl::network_time_tracker() { | 767 network_time::NetworkTimeTracker* BrowserProcessImpl::network_time_tracker() { |
768 if (!network_time_tracker_) { | 768 if (!network_time_tracker_) { |
769 network_time_tracker_.reset(new network_time::NetworkTimeTracker( | 769 network_time_tracker_.reset(new network_time::NetworkTimeTracker( |
770 scoped_ptr<base::TickClock>(new base::DefaultTickClock()), | 770 scoped_refptr<base::TickClock>(new base::DefaultTickClock()), |
771 local_state())); | 771 local_state())); |
772 } | 772 } |
773 return network_time_tracker_.get(); | 773 return network_time_tracker_.get(); |
774 } | 774 } |
775 | 775 |
776 gcm::GCMDriver* BrowserProcessImpl::gcm_driver() { | 776 gcm::GCMDriver* BrowserProcessImpl::gcm_driver() { |
777 DCHECK(CalledOnValidThread()); | 777 DCHECK(CalledOnValidThread()); |
778 if (!gcm_driver_) | 778 if (!gcm_driver_) |
779 CreateGCMDriver(); | 779 CreateGCMDriver(); |
780 return gcm_driver_.get(); | 780 return gcm_driver_.get(); |
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1229 } | 1229 } |
1230 | 1230 |
1231 void BrowserProcessImpl::OnAutoupdateTimer() { | 1231 void BrowserProcessImpl::OnAutoupdateTimer() { |
1232 if (CanAutorestartForUpdate()) { | 1232 if (CanAutorestartForUpdate()) { |
1233 DLOG(WARNING) << "Detected update. Restarting browser."; | 1233 DLOG(WARNING) << "Detected update. Restarting browser."; |
1234 RestartBackgroundInstance(); | 1234 RestartBackgroundInstance(); |
1235 } | 1235 } |
1236 } | 1236 } |
1237 | 1237 |
1238 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1238 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |