Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Side by Side Diff: chrome/installer/util/installation_validator.cc

Issue 109673004: Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the hea… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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>
11 #include <string> 11 #include <string>
12 12
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "base/version.h"
15 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
16 #include "chrome/installer/util/browser_distribution.h" 17 #include "chrome/installer/util/browser_distribution.h"
17 #include "chrome/installer/util/google_update_constants.h" 18 #include "chrome/installer/util/google_update_constants.h"
18 #include "chrome/installer/util/helper.h" 19 #include "chrome/installer/util/helper.h"
19 #include "chrome/installer/util/installation_state.h" 20 #include "chrome/installer/util/installation_state.h"
20 21
21 namespace installer { 22 namespace installer {
22 23
23 BrowserDistribution::Type 24 BrowserDistribution::Type
24 InstallationValidator::ChromeRules::distribution_type() const { 25 InstallationValidator::ChromeRules::distribution_type() const {
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 InstallationType* type) { 815 InstallationType* type) {
815 DCHECK(type); 816 DCHECK(type);
816 InstallationState machine_state; 817 InstallationState machine_state;
817 818
818 machine_state.Initialize(); 819 machine_state.Initialize();
819 820
820 return ValidateInstallationTypeForState(machine_state, system_level, type); 821 return ValidateInstallationTypeForState(machine_state, system_level, type);
821 } 822 }
822 823
823 } // namespace installer 824 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/util/installation_state.cc ('k') | chrome/installer/util/installation_validator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698