Revert 148046 - Revert 147650 - Implement installation of the Chrome App Host.

chrome/installer/util/channel_info.cc

 // 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.
 
 #include "chrome/installer/util/channel_info.h"
 
 #include "base/logging.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/util_constants.h"
 
 using base::win::RegKey;
 
 namespace {
 
 const wchar_t kModChrome[] = L"-chrome";
 const wchar_t kModChromeFrame[] = L"-chromeframe";
+const wchar_t kModAppHost[] = L"-apphost";
 const wchar_t kModMultiInstall[] = L"-multi";
 const wchar_t kModReadyMode[] = L"-readymode";
 const wchar_t kModStage[] = L"-stage:";
 const wchar_t kSfxFull[] = L"-full";
 const wchar_t kSfxMultiFail[] = L"-multifail";
 
 const wchar_t* const kChannels[] = {
   installer::kChromeChannelBeta,
   installer::kChromeChannelDev
 };
 
 const wchar_t* const kModifiers[] = {
   kModStage,
   kModMultiInstall,
   kModChrome,
   kModChromeFrame,
+  kModAppHost,
   kModReadyMode,
   kSfxMultiFail,
   kSfxFull
 };
 
 enum ModifierIndex {
   MOD_STAGE,
   MOD_MULTI_INSTALL,
   MOD_CHROME,
   MOD_CHROME_FRAME,
+  MOD_APP_HOST,
   MOD_READY_MODE,
   SFX_MULTI_FAIL,
   SFX_FULL,
   NUM_MODIFIERS
 };
 
 COMPILE_ASSERT(NUM_MODIFIERS == arraysize(kModifiers),
     kModifiers_disagrees_with_ModifierIndex_comma_they_must_match_bang);
 
 // Returns true if the modifier is found, in which case |position| holds the
@@ skipping 132 matching lines @@
 }
 
 bool ChannelInfo::IsChromeFrame() const {
   return HasModifier(MOD_CHROME_FRAME, value_);
 }
 
 bool ChannelInfo::SetChromeFrame(bool value) {
   return SetModifier(MOD_CHROME_FRAME, value, &value_);
 }
 
+bool ChannelInfo::IsAppHost() const {
+  return HasModifier(MOD_APP_HOST, value_);
+}
+
+bool ChannelInfo::SetAppHost(bool value) {
+  return SetModifier(MOD_APP_HOST, value, &value_);
+}
+
 bool ChannelInfo::IsMultiInstall() const {
   return HasModifier(MOD_MULTI_INSTALL, value_);
 }
 
 bool ChannelInfo::SetMultiInstall(bool value) {
   return SetModifier(MOD_MULTI_INSTALL, value, &value_);
 }
 
 bool ChannelInfo::IsReadyMode() const {
   return HasModifier(MOD_READY_MODE, value_);
@@ skipping 51 matching lines @@
 
 bool ChannelInfo::HasMultiFailSuffix() const {
   return HasModifier(SFX_MULTI_FAIL, value_);
 }
 
 bool ChannelInfo::SetMultiFailSuffix(bool value) {
   return SetModifier(SFX_MULTI_FAIL, value, &value_);
 }
 
 }  // namespace installer