| 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 // Implementation of the installation validator. | 5 // Implementation of the installation validator. |
| 6 | 6 |
| 7 #include "chrome/installer/util/installation_validator.h" | 7 #include "chrome/installer/util/installation_validator.h" |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 return BrowserDistribution::CHROME_APP_HOST; | 118 return BrowserDistribution::CHROME_APP_HOST; |
| 119 } | 119 } |
| 120 | 120 |
| 121 void InstallationValidator::ChromeAppHostRules::AddUninstallSwitchExpectations( | 121 void InstallationValidator::ChromeAppHostRules::AddUninstallSwitchExpectations( |
| 122 const InstallationState& machine_state, | 122 const InstallationState& machine_state, |
| 123 bool system_install, | 123 bool system_install, |
| 124 const ProductState& product_state, | 124 const ProductState& product_state, |
| 125 SwitchExpectations* expectations) const { | 125 SwitchExpectations* expectations) const { |
| 126 DCHECK(!system_install); | 126 DCHECK(!system_install); |
| 127 | 127 |
| 128 // --chrome-app-host must be present. | 128 // --app-host must be present. |
| 129 expectations->push_back(std::make_pair(std::string(switches::kChromeAppHost), | 129 expectations->push_back(std::make_pair(std::string(switches::kChromeAppHost), |
| 130 true)); | 130 true)); |
| 131 // --chrome must not be present. | 131 // --chrome must not be present. |
| 132 expectations->push_back(std::make_pair(std::string(switches::kChrome), | 132 expectations->push_back(std::make_pair(std::string(switches::kChrome), |
| 133 false)); | 133 false)); |
| 134 | 134 |
| 135 // --chrome-frame must not be present. | 135 // --chrome-frame must not be present. |
| 136 expectations->push_back(std::make_pair(std::string(switches::kChromeFrame), | 136 expectations->push_back(std::make_pair(std::string(switches::kChromeFrame), |
| 137 false)); | 137 false)); |
| 138 } | 138 } |
| (...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 856 InstallationType* type) { | 856 InstallationType* type) { |
| 857 DCHECK(type); | 857 DCHECK(type); |
| 858 InstallationState machine_state; | 858 InstallationState machine_state; |
| 859 | 859 |
| 860 machine_state.Initialize(); | 860 machine_state.Initialize(); |
| 861 | 861 |
| 862 return ValidateInstallationTypeForState(machine_state, system_level, type); | 862 return ValidateInstallationTypeForState(machine_state, system_level, type); |
| 863 } | 863 } |
| 864 | 864 |
| 865 } // namespace installer | 865 } // namespace installer |
| OLD | NEW |