| 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 743 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 754 | 754 |
| 755 ComponentUpdateService* BrowserProcessImpl::component_updater() { | 755 ComponentUpdateService* BrowserProcessImpl::component_updater() { |
| 756 if (!component_updater_.get()) { | 756 if (!component_updater_.get()) { |
| 757 ComponentUpdateService::Configurator* configurator = | 757 ComponentUpdateService::Configurator* configurator = |
| 758 MakeChromeComponentUpdaterConfigurator( | 758 MakeChromeComponentUpdaterConfigurator( |
| 759 CommandLine::ForCurrentProcess(), | 759 CommandLine::ForCurrentProcess(), |
| 760 io_thread()->system_url_request_context_getter()); | 760 io_thread()->system_url_request_context_getter()); |
| 761 // Creating the component updater does not do anything, components | 761 // Creating the component updater does not do anything, components |
| 762 // need to be registered and Start() needs to be called. | 762 // need to be registered and Start() needs to be called. |
| 763 component_updater_.reset(ComponentUpdateServiceFactory(configurator)); | 763 component_updater_.reset(ComponentUpdateServiceFactory(configurator)); |
| 764 configurator->Init(component_updater_.get()); |
| 764 } | 765 } |
| 765 return component_updater_.get(); | 766 return component_updater_.get(); |
| 766 } | 767 } |
| 767 | 768 |
| 768 CRLSetFetcher* BrowserProcessImpl::crl_set_fetcher() { | 769 CRLSetFetcher* BrowserProcessImpl::crl_set_fetcher() { |
| 769 if (!crl_set_fetcher_.get()) | 770 if (!crl_set_fetcher_.get()) |
| 770 crl_set_fetcher_ = new CRLSetFetcher(); | 771 crl_set_fetcher_ = new CRLSetFetcher(); |
| 771 return crl_set_fetcher_.get(); | 772 return crl_set_fetcher_.get(); |
| 772 } | 773 } |
| 773 | 774 |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1042 } | 1043 } |
| 1043 | 1044 |
| 1044 void BrowserProcessImpl::OnAutoupdateTimer() { | 1045 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1045 if (CanAutorestartForUpdate()) { | 1046 if (CanAutorestartForUpdate()) { |
| 1046 DLOG(WARNING) << "Detected update. Restarting browser."; | 1047 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1047 RestartBackgroundInstance(); | 1048 RestartBackgroundInstance(); |
| 1048 } | 1049 } |
| 1049 } | 1050 } |
| 1050 | 1051 |
| 1051 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1052 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |