Remove base/win/metro.{cc|h} and some associated code

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 18 matching lines @@
 #include "base/memory/scoped_vector.h"
 #include "base/path_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "base/values.h"
-#include "base/win/metro.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_co_mem.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/shortcut.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/beacons.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 243 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));
-    // If Metro is not supported, remove the DelegateExecute entry instead of
-    // adding it.
-    if (!base::win::IsChromeMetroSupported())
-      entries->back()->set_removal_flag(RegistryEntry::RemovalFlag::VALUE);
+    entries->back()->set_removal_flag(RegistryEntry::RemovalFlag::VALUE);

[gab, 2016/01/12 21:11:04]

This code could be simplified. Only reason to introduce RemovalFlag in the first
place was that this could not simply be removal code but had to be inlined with
insertion code.

It could now simply be unconditional cleanup code and we could get rid of
RemovalFlag which was introduced for this specific use case.

Please add TODOs here as this code looks very weird as such without legacy Metro
context.

[scottmg, 2016/01/13 20:48:16]

Done. I don't fully understand the code, or when it's used, so just added the
TODO for now.

   }
 
   // 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 57 matching lines @@
   app_info.application_description = dist->GetAppDescription();
   app_info.publisher_name = dist->GetPublisherName();
 
   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);
-    if (!base::win::IsChromeMetroSupported()) {
-      // Remove the keys (not only their values) so that Windows will continue
-      // to launch Chrome without a pesky association error.
-      for (RegistryEntry* entry : delegate_execute_entries)
-        entry->set_removal_flag(RegistryEntry::RemovalFlag::KEY);
-    }
+    // Remove the keys (not only their values) so that Windows will continue

[gab, 2016/01/12 21:11:04]

Ditto here: add TODO

[scottmg, 2016/01/13 20:48:16]

Done.

+    // to launch Chrome without a pesky association error.
+    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
 // capability of handling a protocol on Windows.
 void GetProtocolCapabilityEntries(BrowserDistribution* dist,
@@ skipping 1937 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;
 }