| 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 <stddef.h> |
| 10 |
| 9 #include <algorithm> | 11 #include <algorithm> |
| 10 #include <set> | 12 #include <set> |
| 11 #include <string> | 13 #include <string> |
| 12 | 14 |
| 13 #include "base/logging.h" | 15 #include "base/logging.h" |
| 16 #include "base/macros.h" |
| 14 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
| 15 #include "base/version.h" | 18 #include "base/version.h" |
| 16 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" |
| 17 #include "chrome/installer/util/browser_distribution.h" | 20 #include "chrome/installer/util/browser_distribution.h" |
| 18 #include "chrome/installer/util/google_update_constants.h" | 21 #include "chrome/installer/util/google_update_constants.h" |
| 19 #include "chrome/installer/util/helper.h" | 22 #include "chrome/installer/util/helper.h" |
| 20 #include "chrome/installer/util/installation_state.h" | 23 #include "chrome/installer/util/installation_state.h" |
| 21 | 24 |
| 22 namespace installer { | 25 namespace installer { |
| 23 | 26 |
| (...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 580 InstallationType* type) { | 583 InstallationType* type) { |
| 581 DCHECK(type); | 584 DCHECK(type); |
| 582 InstallationState machine_state; | 585 InstallationState machine_state; |
| 583 | 586 |
| 584 machine_state.Initialize(); | 587 machine_state.Initialize(); |
| 585 | 588 |
| 586 return ValidateInstallationTypeForState(machine_state, system_level, type); | 589 return ValidateInstallationTypeForState(machine_state, system_level, type); |
| 587 } | 590 } |
| 588 | 591 |
| 589 } // namespace installer | 592 } // namespace installer |
| OLD | NEW |