| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 645 } else if (*pref == prefs::kAllowCrossOriginAuthPrompt) { | 645 } else if (*pref == prefs::kAllowCrossOriginAuthPrompt) { |
| 646 ApplyAllowCrossOriginAuthPromptPolicy(); | 646 ApplyAllowCrossOriginAuthPromptPolicy(); |
| 647 } | 647 } |
| 648 } else { | 648 } else { |
| 649 NOTREACHED(); | 649 NOTREACHED(); |
| 650 } | 650 } |
| 651 } | 651 } |
| 652 | 652 |
| 653 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 653 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| 654 void BrowserProcessImpl::StartAutoupdateTimer() { | 654 void BrowserProcessImpl::StartAutoupdateTimer() { |
| 655 autoupdate_timer_.Start(FROM_HERE, | 655 autoupdate_timer_.Start( |
| 656 base::TimeDelta::FromHours(kUpdateCheckIntervalHours), | 656 base::TimeDelta::FromHours(kUpdateCheckIntervalHours), |
| 657 this, | 657 this, |
| 658 &BrowserProcessImpl::OnAutoupdateTimer); | 658 &BrowserProcessImpl::OnAutoupdateTimer); |
| 659 } | 659 } |
| 660 #endif | 660 #endif |
| 661 | 661 |
| 662 ChromeNetLog* BrowserProcessImpl::net_log() { | 662 ChromeNetLog* BrowserProcessImpl::net_log() { |
| 663 return net_log_.get(); | 663 return net_log_.get(); |
| 664 } | 664 } |
| 665 | 665 |
| (...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1096 } | 1096 } |
| 1097 | 1097 |
| 1098 void BrowserProcessImpl::OnAutoupdateTimer() { | 1098 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1099 if (CanAutorestartForUpdate()) { | 1099 if (CanAutorestartForUpdate()) { |
| 1100 DLOG(WARNING) << "Detected update. Restarting browser."; | 1100 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1101 RestartPersistentInstance(); | 1101 RestartPersistentInstance(); |
| 1102 } | 1102 } |
| 1103 } | 1103 } |
| 1104 | 1104 |
| 1105 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1105 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |