| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 961 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 972 if (!pnacl_component_installer_) { | 972 if (!pnacl_component_installer_) { |
| 973 pnacl_component_installer_ = | 973 pnacl_component_installer_ = |
| 974 new component_updater::PnaclComponentInstaller(); | 974 new component_updater::PnaclComponentInstaller(); |
| 975 } | 975 } |
| 976 return pnacl_component_installer_.get(); | 976 return pnacl_component_installer_.get(); |
| 977 #else | 977 #else |
| 978 return nullptr; | 978 return nullptr; |
| 979 #endif | 979 #endif |
| 980 } | 980 } |
| 981 | 981 |
| 982 #if defined(OS_CHROMEOS) |
| 983 component_updater::DefaultComponentInstaller* |
| 984 BrowserProcessImpl::cros_component_installer( |
| 985 const std::string& name, |
| 986 std::unique_ptr<component_updater::ComponentInstallerTraits> |
| 987 installer_traits) { |
| 988 auto it = cros_component_installers_.find(name); |
| 989 if (it == cros_component_installers_.end()) { |
| 990 cros_component_installers_[name] = |
| 991 new component_updater::DefaultComponentInstaller( |
| 992 std::move(installer_traits)); |
| 993 } |
| 994 return cros_component_installers_[name].get(); |
| 995 } |
| 996 #endif |
| 997 |
| 982 component_updater::SupervisedUserWhitelistInstaller* | 998 component_updater::SupervisedUserWhitelistInstaller* |
| 983 BrowserProcessImpl::supervised_user_whitelist_installer() { | 999 BrowserProcessImpl::supervised_user_whitelist_installer() { |
| 984 if (!supervised_user_whitelist_installer_) { | 1000 if (!supervised_user_whitelist_installer_) { |
| 985 supervised_user_whitelist_installer_ = | 1001 supervised_user_whitelist_installer_ = |
| 986 component_updater::SupervisedUserWhitelistInstaller::Create( | 1002 component_updater::SupervisedUserWhitelistInstaller::Create( |
| 987 component_updater(), | 1003 component_updater(), |
| 988 &profile_manager()->GetProfileAttributesStorage(), | 1004 &profile_manager()->GetProfileAttributesStorage(), |
| 989 local_state()); | 1005 local_state()); |
| 990 } | 1006 } |
| 991 return supervised_user_whitelist_installer_.get(); | 1007 return supervised_user_whitelist_installer_.get(); |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1421 } | 1437 } |
| 1422 | 1438 |
| 1423 void BrowserProcessImpl::OnAutoupdateTimer() { | 1439 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1424 if (CanAutorestartForUpdate()) { | 1440 if (CanAutorestartForUpdate()) { |
| 1425 DLOG(WARNING) << "Detected update. Restarting browser."; | 1441 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1426 RestartBackgroundInstance(); | 1442 RestartBackgroundInstance(); |
| 1427 } | 1443 } |
| 1428 } | 1444 } |
| 1429 | 1445 |
| 1430 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1446 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |