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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
629 return media_file_system_registry_.get(); | 629 return media_file_system_registry_.get(); |
630 #endif | 630 #endif |
631 } | 631 } |
632 | 632 |
633 bool BrowserProcessImpl::created_local_state() const { | 633 bool BrowserProcessImpl::created_local_state() const { |
634 return created_local_state_; | 634 return created_local_state_; |
635 } | 635 } |
636 | 636 |
637 #if defined(ENABLE_WEBRTC) | 637 #if defined(ENABLE_WEBRTC) |
638 WebRtcLogUploader* BrowserProcessImpl::webrtc_log_uploader() { | 638 WebRtcLogUploader* BrowserProcessImpl::webrtc_log_uploader() { |
639 if (!webrtc_log_uploader_.get()) | 639 if (!webrtc_log_uploader_.get()) { |
640 webrtc_log_uploader_.reset(new WebRtcLogUploader()); | 640 base::FilePath empty_path; |
641 webrtc_log_uploader_.reset(new WebRtcLogUploader(empty_path)); | |
jochen (gone - plz use gerrit)
2013/07/01 11:46:26
nit. Doesn't WebRtcLogUploader(base::FilePath()) w
tommi (sloooow) - chröme
2013/07/01 12:01:01
instead of requiring an empty path can we have two
Henrik Grunell
2013/07/01 13:26:22
As per the next comment, I've removed the argument
| |
642 } | |
641 return webrtc_log_uploader_.get(); | 643 return webrtc_log_uploader_.get(); |
642 } | 644 } |
643 #endif | 645 #endif |
644 | 646 |
645 // static | 647 // static |
646 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { | 648 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { |
647 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, | 649 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, |
648 false); | 650 false); |
649 // This policy needs to be defined before the net subsystem is initialized, | 651 // This policy needs to be defined before the net subsystem is initialized, |
650 // so we do it here. | 652 // so we do it here. |
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1042 } | 1044 } |
1043 | 1045 |
1044 void BrowserProcessImpl::OnAutoupdateTimer() { | 1046 void BrowserProcessImpl::OnAutoupdateTimer() { |
1045 if (CanAutorestartForUpdate()) { | 1047 if (CanAutorestartForUpdate()) { |
1046 DLOG(WARNING) << "Detected update. Restarting browser."; | 1048 DLOG(WARNING) << "Detected update. Restarting browser."; |
1047 RestartBackgroundInstance(); | 1049 RestartBackgroundInstance(); |
1048 } | 1050 } |
1049 } | 1051 } |
1050 | 1052 |
1051 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1053 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |