Follow up to https://codereview.chromium.org/1581473002 for Metro removal in installer

chrome/installer/util/shell_util.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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include "chrome/installer/util/shell_util.h"
@@ skipping 282 matching lines @@
   entries->push_back(new RegistryEntry(
       prog_id_path + ShellUtil::kRegDefaultIcon,
       ShellUtil::FormatIconLocation(app_info.file_type_icon_path,
                                     app_info.file_type_icon_index)));
   entries->push_back(new RegistryEntry(prog_id_path + ShellUtil::kRegShellOpen,
                                        app_info.command_line));
   if (!app_info.delegate_clsid.empty()) {
     entries->push_back(new RegistryEntry(
         prog_id_path + ShellUtil::kRegShellOpen, ShellUtil::kRegDelegateExecute,
         app_info.delegate_clsid));
+    // TODO(scottmg): Simplify after Metro removal. https://crbug.com/558054.
     entries->back()->set_removal_flag(RegistryEntry::RemovalFlag::VALUE);
   }
 
   // The following entries are required as of Windows 8, but do not
   // depend on the DelegateExecute verb handler being set.
   if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
     if (!app_info.app_id.empty()) {
       entries->push_back(new RegistryEntry(
           prog_id_path, ShellUtil::kRegAppUserModelId, app_info.app_id));
     }
@@ skipping 60 matching lines @@
 
   app_info.delegate_clsid = dist->GetCommandExecuteImplClsid();
 
   GetProgIdEntries(app_info, entries);
 
   if (!app_info.delegate_clsid.empty()) {
     ScopedVector<RegistryEntry> delegate_execute_entries =
         GetChromeDelegateExecuteEntries(chrome_exe, app_info);
     // Remove the keys (not only their values) so that Windows will continue
     // to launch Chrome without a pesky association error.
+    // TODO(scottmg): Simplify after Metro removal. https://crbug.com/558054.
     for (RegistryEntry* entry : delegate_execute_entries)
       entry->set_removal_flag(RegistryEntry::RemovalFlag::KEY);
     // Move |delegate_execute_entries| to |entries|.
     entries->insert(entries->end(), delegate_execute_entries.begin(),
                     delegate_execute_entries.end());
     delegate_execute_entries.weak_clear();
   }
 }
 
 // This method returns a list of the registry entries needed to declare a
@@ skipping 547 matching lines @@
     default:
       NOTREACHED();
       return base::win::SHORTCUT_REPLACE_EXISTING;
   }
 }
 
 // Returns a base::win::ShortcutProperties struct containing the properties
 // to set on the shortcut based on the provided ShellUtil::ShortcutProperties.
 base::win::ShortcutProperties TranslateShortcutProperties(
     const ShellUtil::ShortcutProperties& properties) {
   base::win::ShortcutProperties shortcut_properties;

[gab, 2016/01/14 03:22:17]

Also add a TODO on base::win::ShortcutProperties's |dual_mode| field to simplify
after Metro removal (that one is a bit more involved I suspect though so I'm
happy to handle it).

[gab, 2016/01/14 17:08:24]

Actually nvm, looking at what's involved here this morning, it's more than a
code cleanup, we'll need to keep this around for a little while to clean
installed shortcuts first. I'll handle cleanup and dropping TODOs where needed.

 
   if (properties.has_target()) {
     shortcut_properties.set_target(properties.target);
     DCHECK(!properties.target.DirName().empty());
     shortcut_properties.set_working_dir(properties.target.DirName());
   }
 
   if (properties.has_arguments())
     shortcut_properties.set_arguments(properties.arguments);
 
   if (properties.has_description())
     shortcut_properties.set_description(properties.description);
 
   if (properties.has_icon())
     shortcut_properties.set_icon(properties.icon, properties.icon_index);
 
   if (properties.has_app_id())
     shortcut_properties.set_app_id(properties.app_id);
 
-  if (properties.has_dual_mode())
-    shortcut_properties.set_dual_mode(properties.dual_mode);
-
   return shortcut_properties;
 }
 
 // Cleans up an old verb (run) we used to register in
 // <root>\Software\Classes\Chrome<.suffix>\.exe\shell\run on Windows 8.
 void RemoveRunVerbOnWindows8(BrowserDistribution* dist,
                              const base::FilePath& chrome_exe) {
   if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
     bool is_per_user_install = InstallUtil::IsPerUserInstall(chrome_exe);
     HKEY root_key = DetermineRegistrationRoot(is_per_user_install);
@@ skipping 389 matching lines @@
 const wchar_t* ShellUtil::kRegVerbOpen = L"open";
 const wchar_t* ShellUtil::kRegVerbOpenNewWindow = L"opennewwindow";
 const wchar_t* ShellUtil::kRegVerbRun = L"run";
 const wchar_t* ShellUtil::kRegCommand = L"command";
 const wchar_t* ShellUtil::kRegDelegateExecute = L"DelegateExecute";
 const wchar_t* ShellUtil::kRegOpenWithProgids = L"OpenWithProgids";
 
 ShellUtil::ShortcutProperties::ShortcutProperties(ShellChange level_in)
     : level(level_in),
       icon_index(0),
-      dual_mode(false),
       pin_to_taskbar(false),
       options(0U) {}
 
 ShellUtil::ShortcutProperties::~ShortcutProperties() {
 }
 
 bool ShellUtil::QuickIsChromeRegisteredInHKLM(BrowserDistribution* dist,
                                               const base::FilePath& chrome_exe,
                                               const base::string16& suffix) {
   return QuickIsChromeRegistered(dist, chrome_exe, suffix,
@@ skipping 939 matching lines @@
        itr != entries.end(); ++itr)
     (*itr)->AddToWorkItemList(root, items.get());
 
   // Apply all the registry changes and if there is a problem, rollback
   if (!items->Do()) {
     items->Rollback();
     return false;
   }
   return true;
 }