Fix bugs related to making Chrome default browser on Vista.

chrome/installer/util/shell_util.h

 // Copyright (c) 2006-2008 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 declares methods that are useful for integrating Chrome in
 // Windows shell. These methods are all static and currently part of
 // ShellUtil class.
 
 #ifndef CHROME_INSTALLER_UTIL_SHELL_UTIL_H__
 #define CHROME_INSTALLER_UTIL_SHELL_UTIL_H__
@@ skipping 36 matching lines @@
   static const wchar_t* kRegStartMenuInternet;
 
   // Relative path of Classes registry entry under which file associations
   // are added on Windows.
   static const wchar_t* kRegClasses;
 
   // Relative path of RegisteredApplications registry entry under which
   // we add Chrome as a Windows application
   static const wchar_t* kRegRegisteredApplications;
 
+  // The key path and key name required to register Chrome on Windows such
+  // that it can be launched from Start->Run just by name (chrome.exe).
+  static const wchar_t* kAppPathsRegistryKey;
+  static const wchar_t* kAppPathsRegistryPathName;
+
   // Name that we give to Chrome file association handler ProgId.
   static const wchar_t* kChromeHTMLProgId;
 
   // Description of Chrome file/URL association handler ProgId.
   static const wchar_t* kChromeHTMLProgIdDesc;
 
   // Registry path that stores url associations on Vista.
   static const wchar_t* kRegVistaUrlPrefs;
 
   // File extensions that Chrome registers itself for.
   static const wchar_t* kFileAssociations[];
 
   // Protocols that Chrome registers itself for.
   static const wchar_t* kProtocolAssociations[];
 
   // Registry value name that is needed for ChromeHTML ProgId
   static const wchar_t* kRegUrlProtocol;
 
   // Name that we give to Chrome extension file association handler ProgId.
   static const wchar_t* kChromeExtProgId;
 
   // Description of Chrome file/URL association handler ProgId.
   static const wchar_t* kChromeExtProgIdDesc;
 
-  // Populate work_item_list with WorkItem entries that will add chrome.exe to
-  // the set of App Paths registry keys so that ShellExecute can find it. Note
-  // that this is done in HKLM, regardless of whether this is a single-user
-  // install or not. For non-admin users, this will fail.
-  // chrome_exe: full path to chrome.exe
-  // work_item_list: pointer to the WorkItemList that will be populated
-  static void AddChromeAppPathWorkItems(const std::wstring& chrome_exe,
-                                        WorkItemList* work_item_list);
-
   // This method adds Chrome to the list that shows up in Add/Remove Programs->
   // Set Program Access and Defaults and also creates Chrome ProgIds under
   // Software\Classes. This method requires write access to HKLM so is just
   // best effort deal. If write to HKLM fails and skip_if_not_admin is false,
   // this method will:
   // - add the ProgId entries to HKCU on XP. HKCU entries will not make
   //   Chrome show in Set Program Access and Defaults but they are still useful
   //   because we can make Chrome run when user clicks on http link or html
   //   file.
   // - will try to launch setup.exe with admin priviledges on Vista to do
@@ skipping 97 matching lines @@
   static bool UpdateChromeShortcut(const std::wstring& chrome_exe,
                                    const std::wstring& shortcut,
                                    bool create_new);
 
  private:
   DISALLOW_EVIL_CONSTRUCTORS(ShellUtil);
 };
 
 
 #endif  // CHROME_INSTALLER_UTIL_SHELL_UTIL_H__
-