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

chrome/installer/util/master_preferences.cc

Index: chrome/installer/util/master_preferences.cc
===================================================================
--- chrome/installer/util/master_preferences.cc	(revision 148103)
+++ chrome/installer/util/master_preferences.cc	(working copy)
@@ -82,6 +82,7 @@
 MasterPreferences::MasterPreferences() : distribution_(NULL),
                                          preferences_read_from_file_(false),
                                          chrome_(true),
+                                         chrome_app_host_(false),
                                          chrome_frame_(false),
                                          multi_install_(false) {
   InitializeFromCommandLine(*CommandLine::ForCurrentProcess());
@@ -91,6 +92,7 @@
     : distribution_(NULL),
       preferences_read_from_file_(false),
       chrome_(true),
+      chrome_app_host_(false),
       chrome_frame_(false),
       multi_install_(false) {
   InitializeFromCommandLine(cmd_line);
@@ -98,7 +100,8 @@
 
 MasterPreferences::MasterPreferences(const FilePath& prefs_path)
     : distribution_(NULL), preferences_read_from_file_(false),
-      chrome_(true), chrome_frame_(false), multi_install_(false) {
+      chrome_(true), chrome_app_host_(false), chrome_frame_(false),
+      multi_install_(false) {
   master_dictionary_.reset(ParseDistributionPreferences(prefs_path));
 
   if (!master_dictionary_.get()) {
@@ -136,6 +139,8 @@
   } translate_switches[] = {
     { installer::switches::kAutoLaunchChrome,
       installer::master_preferences::kAutoLaunchChrome },
+    { installer::switches::kChromeAppHost,
+      installer::master_preferences::kChromeAppHost },
     { installer::switches::kChrome,
       installer::master_preferences::kChrome },
     { installer::switches::kChromeFrame,
@@ -207,10 +212,12 @@
   // Make sure we start out with the correct defaults.
   multi_install_ = false;
   chrome_frame_ = false;
+  chrome_app_host_ = false;
   chrome_ = true;
 
   GetBool(installer::master_preferences::kMultiInstall, &multi_install_);
   GetBool(installer::master_preferences::kChromeFrame, &chrome_frame_);
+  GetBool(installer::master_preferences::kChromeAppHost, &chrome_app_host_);
 
   // When multi-install is specified, the checks are pretty simple (in theory):
   // In order to be installed/uninstalled, each product must have its switch