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 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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( | 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 FROM_HERE); |
659 } | 660 } |
660 #endif | 661 #endif |
661 | 662 |
662 ChromeNetLog* BrowserProcessImpl::net_log() { | 663 ChromeNetLog* BrowserProcessImpl::net_log() { |
663 return net_log_.get(); | 664 return net_log_.get(); |
664 } | 665 } |
665 | 666 |
666 prerender::PrerenderTracker* BrowserProcessImpl::prerender_tracker() { | 667 prerender::PrerenderTracker* BrowserProcessImpl::prerender_tracker() { |
667 if (!prerender_tracker_.get()) | 668 if (!prerender_tracker_.get()) |
668 prerender_tracker_.reset(new prerender::PrerenderTracker); | 669 prerender_tracker_.reset(new prerender::PrerenderTracker); |
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1094 } | 1095 } |
1095 | 1096 |
1096 void BrowserProcessImpl::OnAutoupdateTimer() { | 1097 void BrowserProcessImpl::OnAutoupdateTimer() { |
1097 if (CanAutorestartForUpdate()) { | 1098 if (CanAutorestartForUpdate()) { |
1098 DLOG(WARNING) << "Detected update. Restarting browser."; | 1099 DLOG(WARNING) << "Detected update. Restarting browser."; |
1099 RestartPersistentInstance(); | 1100 RestartPersistentInstance(); |
1100 } | 1101 } |
1101 } | 1102 } |
1102 | 1103 |
1103 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1104 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |