Change shortcut install location to non-subdir.

chrome/browser/shell_integration_win.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/browser/shell_integration.h"
 
 #include <windows.h>
 #include <shlwapi.h>
 #include <shobjidl.h>
 #include <propkey.h>  // Needs to come after shobjidl.h.
@@ skipping 606 matching lines @@
   size_t folder = InstallUtil::IsPerUserInstall(chrome_exe) ? 1 : 0;
   for (; folder < arraysize(kFolderIds); ++folder) {
     if (!PathService::Get(kFolderIds[folder], &programs_folder)) {
       NOTREACHED();
       continue;
     }
 
     shortcut = programs_folder.Append(shortcut_name);
     if (base::PathExists(shortcut))
       return shortcut;
-
-    // Check in "Start Menu\Programs\<BROWSER>" if the shortcut was not found in
-    // "Start Menu\Programs". This fallback check is here to handle running
-    // instances that are updated past the change that migrates Chrome's start
-    // menu shortcut from the "Google Chrome" folder up into the main "Programs"
-    // folder. This code will become obsolete when the migration change lands,
-    // and is to be removed in that change.
-    shortcut =
-        programs_folder.Append(dist->GetStartMenuShortcutSubfolder(
-                                   BrowserDistribution::SUBFOLDER_CHROME))
-            .Append(shortcut_name);
-    if (base::PathExists(shortcut))
-      return shortcut;
   }
 
   return base::FilePath();
 }
 
 // static
 bool ShellIntegration::DefaultWebClientWorker::ShouldReportAttemptResults() {
   return base::win::GetVersion() >= base::win::VERSION_WIN10 &&
          IsSetAsDefaultAsynchronous();
 }
@@ skipping 54 matching lines @@
   // in the "How would you like to open this?" prompt.
   if (!RegisterBrowser())
     return false;
 
   ResetDefaultBrowser();
 
   base::CommandLine cmdline(base::FilePath(L"openwith.exe"));
   cmdline.AppendArgNative(StartupBrowserCreator::GetDefaultBrowserUrl());
   return base::LaunchProcess(cmdline, base::LaunchOptions()).IsValid();
 }