Implementing --app-launcher install/uninstall flow.

chrome/installer/util/master_preferences.cc

Index: chrome/installer/util/master_preferences.cc
diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc
index d397b8c3dfcd701722fa9ee583d1ba545080d230..b3f21defac647ae0a7ccbc9c830f3202848a729e 100644
--- a/chrome/installer/util/master_preferences.cc
+++ b/chrome/installer/util/master_preferences.cc
@@ -82,6 +82,7 @@ MasterPreferences::MasterPreferences() : distribution_(NULL),
                                          preferences_read_from_file_(false),
                                          chrome_(true),
                                          chrome_app_host_(false),
+                                         chrome_app_launcher_(false),
                                          chrome_frame_(false),
                                          multi_install_(false) {
   InitializeFromCommandLine(*CommandLine::ForCurrentProcess());
@@ -92,14 +93,19 @@ MasterPreferences::MasterPreferences(const CommandLine& cmd_line)
       preferences_read_from_file_(false),
       chrome_(true),
       chrome_app_host_(false),
+      chrome_app_launcher_(false),
       chrome_frame_(false),
       multi_install_(false) {
   InitializeFromCommandLine(cmd_line);
 }
 
 MasterPreferences::MasterPreferences(const FilePath& prefs_path)
-    : distribution_(NULL), preferences_read_from_file_(false),
-      chrome_(true), chrome_app_host_(false), chrome_frame_(false),
+    : distribution_(NULL),
+      preferences_read_from_file_(false),
+      chrome_(true),
+      chrome_app_host_(false),
+      chrome_app_launcher_(false),
+      chrome_frame_(false),
       multi_install_(false) {
   master_dictionary_.reset(ParseDistributionPreferences(prefs_path));
 
@@ -141,6 +147,8 @@ void MasterPreferences::InitializeFromCommandLine(const CommandLine& cmd_line) {
       installer::master_preferences::kAutoLaunchChrome },
     { installer::switches::kChromeAppHost,
       installer::master_preferences::kChromeAppHost },
+    { installer::switches::kChromeAppLauncher,
+      installer::master_preferences::kChromeAppLauncher },
     { installer::switches::kChrome,
       installer::master_preferences::kChrome },
     { installer::switches::kChromeFrame,
@@ -214,11 +222,14 @@ void MasterPreferences::InitializeProductFlags() {
   multi_install_ = false;
   chrome_frame_ = false;
   chrome_app_host_ = false;
+  chrome_app_launcher_ = 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_);
+  GetBool(installer::master_preferences::kChromeAppLauncher,
+          &chrome_app_launcher_);
 
   // When multi-install is specified, the checks are pretty simple (in theory):
   // In order to be installed/uninstalled, each product must have its switch