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/installer/util/installation_state.h" | 5 #include "chrome/installer/util/installation_state.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "base/version.h" | 9 #include "base/version.h" |
10 #include "base/win/registry.h" | 10 #include "base/win/registry.h" |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 if (key.ReadValueDW(google_update::kRegEULAAceptedField, | 136 if (key.ReadValueDW(google_update::kRegEULAAceptedField, |
137 &dword_value) == ERROR_SUCCESS) { | 137 &dword_value) == ERROR_SUCCESS) { |
138 has_eula_accepted_ = true; | 138 has_eula_accepted_ = true; |
139 eula_accepted_ = dword_value; | 139 eula_accepted_ = dword_value; |
140 } | 140 } |
141 } | 141 } |
142 | 142 |
143 return version_.get() != NULL; | 143 return version_.get() != NULL; |
144 } | 144 } |
145 | 145 |
146 FilePath ProductState::GetSetupPath() const { | 146 base::FilePath ProductState::GetSetupPath() const { |
147 return uninstall_command_.GetProgram(); | 147 return uninstall_command_.GetProgram(); |
148 } | 148 } |
149 | 149 |
150 const Version& ProductState::version() const { | 150 const Version& ProductState::version() const { |
151 DCHECK(version_.get() != NULL); | 151 DCHECK(version_.get() != NULL); |
152 return *version_; | 152 return *version_; |
153 } | 153 } |
154 | 154 |
155 ProductState& ProductState::CopyFrom(const ProductState& other) { | 155 ProductState& ProductState::CopyFrom(const ProductState& other) { |
156 channel_.set_value(other.channel_.value()); | 156 channel_.set_value(other.channel_.value()); |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 } | 268 } |
269 | 269 |
270 const ProductState* InstallationState::GetProductState( | 270 const ProductState* InstallationState::GetProductState( |
271 bool system_install, | 271 bool system_install, |
272 BrowserDistribution::Type type) const { | 272 BrowserDistribution::Type type) const { |
273 const ProductState* product_state = | 273 const ProductState* product_state = |
274 GetNonVersionedProductState(system_install, type); | 274 GetNonVersionedProductState(system_install, type); |
275 return product_state->version_.get() == NULL ? NULL : product_state; | 275 return product_state->version_.get() == NULL ? NULL : product_state; |
276 } | 276 } |
277 } // namespace installer | 277 } // namespace installer |
OLD | NEW |