Removing non-Launcher Apps V2 flow, interpreting --app-host as --app-launcher.

The non-Launcher Apps V2 flow:
- Was installed by the "--app-host" switch, and has ap value "-apphost".
- Enables V2 apps to appear in the NTP.
- Cannot be directly uninstalled.

Keeping it around increased complexity, and led to "missed-a-spot" bugs, such as Issue 178025 where app_host.exe passes "--app-host" to setup.exe when app_host.exe updates itself.

Now we remove this flow from the installer, and not keep track of the distinction between "App Host" and "App Launcher".

However, for backwards compatibility, setup.exe will still interpret "--app-host" as "--app-launcher", but will not genreate commands with "--app-host".

BUG=178025,178834


Review URL: https://chromiumcodereview.appspot.com/12388022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185432 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 21 deletions

diff --git a/chrome/installer/util/chrome_app_host_operations.cc b/chrome/installer/util/chrome_app_host_operations.cc
index caa7d7e..3690196 100644
--- a/chrome/installer/util/chrome_app_host_operations.cc
+++ b/chrome/installer/util/chrome_app_host_operations.cc
@@ -28,10 +28,6 @@ void ChromeAppHostOperations::ReadOptions(
       pref_value) {
     options->insert(kOptionMultiInstall);
   }
-  if (prefs.GetBool(master_preferences::kChromeAppLauncher, &pref_value) &&
-      pref_value) {
-    options->insert(kOptionAppHostIsLauncher);
-  }
 }
 
 void ChromeAppHostOperations::ReadOptions(
@@ -41,8 +37,6 @@ void ChromeAppHostOperations::ReadOptions(
 
   if (uninstall_command.HasSwitch(switches::kMultiInstall))
     options->insert(kOptionMultiInstall);
-  if (uninstall_command.HasSwitch(switches::kChromeAppLauncher))
-    options->insert(kOptionAppHostIsLauncher);
 }
 
 void ChromeAppHostOperations::AddKeyFiles(
@@ -68,11 +62,8 @@ void ChromeAppHostOperations::AppendProductFlags(
   if (is_multi_install && !cmd_line->HasSwitch(switches::kMultiInstall))
     cmd_line->AppendSwitch(switches::kMultiInstall);
 
-  // Either --app-launcher or --app-host is always needed.
-  if (options.find(kOptionAppHostIsLauncher) != options.end())
-    cmd_line->AppendSwitch(switches::kChromeAppLauncher);
-  else
-    cmd_line->AppendSwitch(switches::kChromeAppHost);
+  // Add --app-launcher.
+  cmd_line->AppendSwitch(switches::kChromeAppLauncher);
 }
 
 void ChromeAppHostOperations::AppendRenameFlags(
@@ -95,15 +86,7 @@ bool ChromeAppHostOperations::SetChannelFlags(
     ChannelInfo* channel_info) const {
 #if defined(GOOGLE_CHROME_BUILD)
   DCHECK(channel_info);
-  bool modified_app_host = false;
-  bool modified_app_launcher = false;
-  bool is_app_launcher =
-      (options.find(kOptionAppHostIsLauncher) != options.end());
-  // If set, then App Host and App Launcher are mutually exclusive.
-  // If !set, then remove both.
-  modified_app_host = channel_info->SetAppHost(set && !is_app_launcher);
-  modified_app_launcher = channel_info->SetAppLauncher(set && is_app_launcher);
-  return modified_app_host || modified_app_launcher;
+  return channel_info->SetAppLauncher(set);
 #else
   return false;
 #endif
@@ -111,7 +94,7 @@ bool ChromeAppHostOperations::SetChannelFlags(
 
 bool ChromeAppHostOperations::ShouldCreateUninstallEntry(
     const std::set<std::wstring>& options) const {
-  return (options.find(kOptionAppHostIsLauncher) != options.end());
+  return true;
 }
 
 void ChromeAppHostOperations::AddDefaultShortcutProperties(