Implementing --app-launcher install/uninstall flow.

chrome/installer/setup/install.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/setup/install.h"
 
 #include <shlobj.h>
 #include <time.h>
 #include <winuser.h>
 
@@ skipping 332 matching lines @@
 
 void CreateOrUpdateShortcuts(const InstallerState& installer_state,
                              const FilePath& setup_exe,
                              const Product& product,
                              InstallShortcutOperation install_operation,
                              bool alternate_desktop_shortcut) {
   // TODO(tommi): Change this function to use WorkItemList.
   DCHECK(product.is_chrome());
 
   BrowserDistribution* dist = product.distribution();
-  const FilePath chrome_exe(
-      installer_state.target_path().Append(installer::kChromeExe));
   ShellUtil::ShellChange install_level =
       installer_state.system_install() ? ShellUtil::SYSTEM_LEVEL :
                                          ShellUtil::CURRENT_USER;
+  // |base_properties|: The basic properties to set on every shortcut installed

[grt (UTC plus 2), 2012/10/30 13:02:55]

please revert all shortcut-related changes if you're not doing them in this CL.

[erikwright (departed), 2012/10/30 14:20:39]

Feel free to ask for help to split them into a separate CL without losing them.

[huangs, 2012/10/30 20:35:07]

Will remove the "if".  The rest is just minor cleanup.  Will remove if you
insist.

[gab, 2012/10/30 21:30:40]

I don't see how the changes in install.cc/uninstall.cc are at all
necessary/useful by themselves.

I'm sure other things motivated the changes, but the motivation should come
along with the change, no point doing this in this CL imo.

[huangs, 2012/10/30 21:38:39]

I didn't want these trivial changes to add visual clutter when the real stuff
comes.  But oh well; removing them.

[erikwright (departed), 2012/10/30 22:53:52]

If the changes are good refactorings that stand on their own, create a separate
CL for them alone. Don't bundle stuff into other CLs just because it's
convenient (it's not convenient for your reviewers).

It's also not convenient for you. For example, if something causes you to revert
this CL, you will now be reverting more code. And what if someone then starts
coding against your refactored API? Now your revert gets harder.

And you are more likely to have to revert the more code you change. Or more
likely to fail to commit due to a merge conflict, etc.

+  // (to be refined on a per-shortcut basis).
+  ShellUtil::ChromeShortcutProperties base_properties(install_level);
+
+  if (product.is_chrome()) {
+    base_properties.set_chrome_exe(
+        installer_state.target_path().Append(installer::kChromeExe));
+  }
 
   // The default operation on update is to overwrite shortcuts with the
   // currently desired properties, but do so only for shortcuts that still
   // exist.
   ShellUtil::ChromeShortcutOperation shortcut_operation =
       ShellUtil::SHORTCUT_REPLACE_EXISTING;
-
-  // |base_properties|: The basic properties to set on every shortcut installed
-  // (to be refined on a per-shortcut basis).
-  ShellUtil::ChromeShortcutProperties base_properties(install_level);
-  base_properties.set_chrome_exe(chrome_exe);
-
   // If |install_operation| is INSTALL_SHORTCUT_CREATE_ALL, create optional
   // shortcuts (Desktop and Quick Launch) immediately; otherwise delay their
   // creation until first run.
   if (install_operation == INSTALL_SHORTCUT_CREATE_ALL)
     shortcut_operation = ShellUtil::SHORTCUT_CREATE_ALWAYS;
 
   ShellUtil::ChromeShortcutProperties desktop_properties(base_properties);
   if (alternate_desktop_shortcut)
     desktop_properties.set_shortcut_name(dist->GetAlternateApplicationName());
   ExecuteAndLogShortcutOperation(
@@ skipping 14 matching lines @@
         ShellUtil::SHORTCUT_QUICK_LAUNCH, dist, user_ql_properties,
         shortcut_operation);
   }
 
   // Turn on shortcut creation for mandatory shortcuts if requested.
   if (install_operation == INSTALL_SHORTCUT_CREATE_MANDATORY)
     shortcut_operation = ShellUtil::SHORTCUT_CREATE_ALWAYS;
 
   ShellUtil::ChromeShortcutProperties start_menu_properties(base_properties);
   // IMPORTANT: Only the default (no arguments and default browserappid) browser
-  // shortcut in the Start menu (Start screen on Win8+) should be  made dual
+  // shortcut in the Start menu (Start screen on Win8+) should be made dual
   // mode.
   start_menu_properties.set_dual_mode(true);
   if (shortcut_operation == ShellUtil::SHORTCUT_CREATE_ALWAYS)
     start_menu_properties.set_pin_to_taskbar(true);
   ExecuteAndLogShortcutOperation(
       ShellUtil::SHORTCUT_START_MENU, dist, start_menu_properties,
       shortcut_operation);
 }
 
 void RegisterChromeOnMachine(const InstallerState& installer_state,
@@ skipping 171 matching lines @@
   if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
     VLOG(1) << "Updating and registering shortcuts.";
     CreateOrUpdateShortcuts(
         installer_state, setup_exe, chrome, INSTALL_SHORTCUT_REPLACE_EXISTING,
         false);
     RegisterChromeOnMachine(installer_state, chrome, false);
   }
 }
 
 }  // namespace installer