Index: chrome/installer/util/installation_state.cc |
diff --git a/chrome/installer/util/installation_state.cc b/chrome/installer/util/installation_state.cc |
index ab099246c8276e68a75333c3fca6a3ecb7861a29..0e37e091e154fc1f0491955f06e314e01faabaa4 100644 |
--- a/chrome/installer/util/installation_state.cc |
+++ b/chrome/installer/util/installation_state.cc |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -223,9 +223,12 @@ int InstallationState::IndexFromDistType(BrowserDistribution::Type type) { |
unexpected_chrome_frame_distribution_value_); |
COMPILE_ASSERT(BrowserDistribution::CHROME_BINARIES == CHROME_BINARIES_INDEX, |
unexpected_chrome_frame_distribution_value_); |
+ COMPILE_ASSERT(BrowserDistribution::CHROME_APP_HOST == CHROME_APP_HOST_INDEX, |
+ unexpected_chrome_frame_distribution_value_); |
DCHECK(type == BrowserDistribution::CHROME_BROWSER || |
type == BrowserDistribution::CHROME_FRAME || |
- type == BrowserDistribution::CHROME_BINARIES); |
+ type == BrowserDistribution::CHROME_BINARIES || |
+ type == BrowserDistribution::CHROME_APP_HOST); |
return type; |
} |
@@ -246,6 +249,11 @@ void InstallationState::Initialize() { |
BrowserDistribution::CHROME_BINARIES); |
user_products_[CHROME_BINARIES_INDEX].Initialize(false, distribution); |
system_products_[CHROME_BINARIES_INDEX].Initialize(true, distribution); |
+ |
+ distribution = BrowserDistribution::GetSpecificDistribution( |
+ BrowserDistribution::CHROME_APP_HOST); |
+ user_products_[CHROME_APP_HOST_INDEX].Initialize(false, distribution); |
+ system_products_[CHROME_APP_HOST_INDEX].Initialize(true, distribution); |
} |
const ProductState* InstallationState::GetNonVersionedProductState( |