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

chrome/installer/mini_installer/configuration.cc

Index: chrome/installer/mini_installer/configuration.cc
===================================================================
--- chrome/installer/mini_installer/configuration.cc	(revision 148103)
+++ chrome/installer/mini_installer/configuration.cc	(working copy)
@@ -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.
 
@@ -34,6 +34,7 @@
   argument_count_ = 0;
   has_chrome_ = false;
   has_chrome_frame_ = false;
+  has_app_host_ = false;
   is_multi_install_ = false;
   is_system_level_ = false;
 }
@@ -59,6 +60,8 @@
         has_chrome_ = true;
       else if (0 == ::lstrcmpi(args_[i], L"--chrome-frame"))
         has_chrome_frame_ = true;
+      else if (0 == ::lstrcmpi(args_[i], L"--app-host"))
+        has_app_host_ = true;
       else if (0 == ::lstrcmpi(args_[i], L"--multi-install"))
         is_multi_install_ = true;
       else if (0 == ::lstrcmpi(args_[i], L"--system-level"))
@@ -67,9 +70,9 @@
         operation_ = CLEANUP;
     }
 
-    // Single-install is either Chrome or Chrome Frame.
+    // Single-install defaults to Chrome.
     if (!is_multi_install_)
-      has_chrome_ = !has_chrome_frame_;
+      has_chrome_ = !(has_chrome_frame_ || has_app_host_);
   }
   return args_ != NULL;
 }