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

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

Issue 10818021: Revert 147650 - Implement installation of the Chrome App Host. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1215/src/
Patch Set: Created 8 years, 4 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 #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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 } 219 }
220 220
221 // static 221 // static
222 int InstallationState::IndexFromDistType(BrowserDistribution::Type type) { 222 int InstallationState::IndexFromDistType(BrowserDistribution::Type type) {
223 COMPILE_ASSERT(BrowserDistribution::CHROME_BROWSER == CHROME_BROWSER_INDEX, 223 COMPILE_ASSERT(BrowserDistribution::CHROME_BROWSER == CHROME_BROWSER_INDEX,
224 unexpected_chrome_browser_distribution_value_); 224 unexpected_chrome_browser_distribution_value_);
225 COMPILE_ASSERT(BrowserDistribution::CHROME_FRAME == CHROME_FRAME_INDEX, 225 COMPILE_ASSERT(BrowserDistribution::CHROME_FRAME == CHROME_FRAME_INDEX,
226 unexpected_chrome_frame_distribution_value_); 226 unexpected_chrome_frame_distribution_value_);
227 COMPILE_ASSERT(BrowserDistribution::CHROME_BINARIES == CHROME_BINARIES_INDEX, 227 COMPILE_ASSERT(BrowserDistribution::CHROME_BINARIES == CHROME_BINARIES_INDEX,
228 unexpected_chrome_frame_distribution_value_); 228 unexpected_chrome_frame_distribution_value_);
229 COMPILE_ASSERT(BrowserDistribution::CHROME_APP_HOST == CHROME_APP_HOST_INDEX,
230 unexpected_chrome_frame_distribution_value_);
231 DCHECK(type == BrowserDistribution::CHROME_BROWSER || 229 DCHECK(type == BrowserDistribution::CHROME_BROWSER ||
232 type == BrowserDistribution::CHROME_FRAME || 230 type == BrowserDistribution::CHROME_FRAME ||
233 type == BrowserDistribution::CHROME_BINARIES || 231 type == BrowserDistribution::CHROME_BINARIES);
234 type == BrowserDistribution::CHROME_APP_HOST);
235 return type; 232 return type;
236 } 233 }
237 234
238 void InstallationState::Initialize() { 235 void InstallationState::Initialize() {
239 BrowserDistribution* distribution; 236 BrowserDistribution* distribution;
240 237
241 distribution = BrowserDistribution::GetSpecificDistribution( 238 distribution = BrowserDistribution::GetSpecificDistribution(
242 BrowserDistribution::CHROME_BROWSER); 239 BrowserDistribution::CHROME_BROWSER);
243 user_products_[CHROME_BROWSER_INDEX].Initialize(false, distribution); 240 user_products_[CHROME_BROWSER_INDEX].Initialize(false, distribution);
244 system_products_[CHROME_BROWSER_INDEX].Initialize(true, distribution); 241 system_products_[CHROME_BROWSER_INDEX].Initialize(true, distribution);
245 242
246 distribution = BrowserDistribution::GetSpecificDistribution( 243 distribution = BrowserDistribution::GetSpecificDistribution(
247 BrowserDistribution::CHROME_FRAME); 244 BrowserDistribution::CHROME_FRAME);
248 user_products_[CHROME_FRAME_INDEX].Initialize(false, distribution); 245 user_products_[CHROME_FRAME_INDEX].Initialize(false, distribution);
249 system_products_[CHROME_FRAME_INDEX].Initialize(true, distribution); 246 system_products_[CHROME_FRAME_INDEX].Initialize(true, distribution);
250 247
251 distribution = BrowserDistribution::GetSpecificDistribution( 248 distribution = BrowserDistribution::GetSpecificDistribution(
252 BrowserDistribution::CHROME_BINARIES); 249 BrowserDistribution::CHROME_BINARIES);
253 user_products_[CHROME_BINARIES_INDEX].Initialize(false, distribution); 250 user_products_[CHROME_BINARIES_INDEX].Initialize(false, distribution);
254 system_products_[CHROME_BINARIES_INDEX].Initialize(true, distribution); 251 system_products_[CHROME_BINARIES_INDEX].Initialize(true, distribution);
255
256 distribution = BrowserDistribution::GetSpecificDistribution(
257 BrowserDistribution::CHROME_APP_HOST);
258 user_products_[CHROME_APP_HOST_INDEX].Initialize(false, distribution);
259 system_products_[CHROME_APP_HOST_INDEX].Initialize(true, distribution);
260 } 252 }
261 253
262 const ProductState* InstallationState::GetNonVersionedProductState( 254 const ProductState* InstallationState::GetNonVersionedProductState(
263 bool system_install, 255 bool system_install,
264 BrowserDistribution::Type type) const { 256 BrowserDistribution::Type type) const {
265 const ProductState& product_state = (system_install ? system_products_ : 257 const ProductState& product_state = (system_install ? system_products_ :
266 user_products_)[IndexFromDistType(type)]; 258 user_products_)[IndexFromDistType(type)];
267 return &product_state; 259 return &product_state;
268 } 260 }
269 261
270 const ProductState* InstallationState::GetProductState( 262 const ProductState* InstallationState::GetProductState(
271 bool system_install, 263 bool system_install,
272 BrowserDistribution::Type type) const { 264 BrowserDistribution::Type type) const {
273 const ProductState* product_state = 265 const ProductState* product_state =
274 GetNonVersionedProductState(system_install, type); 266 GetNonVersionedProductState(system_install, type);
275 return product_state->version_.get() == NULL ? NULL : product_state; 267 return product_state->version_.get() == NULL ? NULL : product_state;
276 } 268 }
277 } // namespace installer 269 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/util/installation_state.h ('k') | chrome/installer/util/installation_validator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698