| 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 843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 854 prerender_tracker_.reset(new prerender::PrerenderTracker); | 854 prerender_tracker_.reset(new prerender::PrerenderTracker); |
| 855 | 855 |
| 856 return prerender_tracker_.get(); | 856 return prerender_tracker_.get(); |
| 857 } | 857 } |
| 858 | 858 |
| 859 component_updater::ComponentUpdateService* | 859 component_updater::ComponentUpdateService* |
| 860 BrowserProcessImpl::component_updater() { | 860 BrowserProcessImpl::component_updater() { |
| 861 if (!component_updater_.get()) { | 861 if (!component_updater_.get()) { |
| 862 if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) | 862 if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) |
| 863 return NULL; | 863 return NULL; |
| 864 component_updater::Configurator* configurator = | 864 update_client::Configurator* configurator = |
| 865 component_updater::MakeChromeComponentUpdaterConfigurator( | 865 component_updater::MakeChromeComponentUpdaterConfigurator( |
| 866 base::CommandLine::ForCurrentProcess(), | 866 base::CommandLine::ForCurrentProcess(), |
| 867 io_thread()->system_url_request_context_getter()); | 867 io_thread()->system_url_request_context_getter()); |
| 868 // Creating the component updater does not do anything, components | 868 // Creating the component updater does not do anything, components |
| 869 // need to be registered and Start() needs to be called. | 869 // need to be registered and Start() needs to be called. |
| 870 component_updater_.reset(ComponentUpdateServiceFactory(configurator)); | 870 component_updater_.reset( |
| 871 component_updater::ComponentUpdateServiceFactory(configurator)); |
| 871 } | 872 } |
| 872 return component_updater_.get(); | 873 return component_updater_.get(); |
| 873 } | 874 } |
| 874 | 875 |
| 875 CRLSetFetcher* BrowserProcessImpl::crl_set_fetcher() { | 876 CRLSetFetcher* BrowserProcessImpl::crl_set_fetcher() { |
| 876 if (!crl_set_fetcher_.get()) | 877 if (!crl_set_fetcher_.get()) |
| 877 crl_set_fetcher_ = new CRLSetFetcher(); | 878 crl_set_fetcher_ = new CRLSetFetcher(); |
| 878 return crl_set_fetcher_.get(); | 879 return crl_set_fetcher_.get(); |
| 879 } | 880 } |
| 880 | 881 |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1193 } | 1194 } |
| 1194 | 1195 |
| 1195 void BrowserProcessImpl::OnAutoupdateTimer() { | 1196 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1196 if (CanAutorestartForUpdate()) { | 1197 if (CanAutorestartForUpdate()) { |
| 1197 DLOG(WARNING) << "Detected update. Restarting browser."; | 1198 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1198 RestartBackgroundInstance(); | 1199 RestartBackgroundInstance(); |
| 1199 } | 1200 } |
| 1200 } | 1201 } |
| 1201 | 1202 |
| 1202 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1203 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |