For system level install read setup.exe path from HKLM instead of HKCU.

chrome/installer/util/shell_util.cc

 // 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 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 <windows.h>
@@ skipping 57 matching lines @@
     std::wstring app_key = L"Software\\Classes\\Applications\\" + exe_name +
                            L"\\shell\\open\\command";
     entries.push_front(new RegistryEntry(app_key, open_cmd));
     for (int i = 0; ShellUtil::kFileAssociations[i] != NULL; i++) {
       std::wstring open_with_key(L"Software\\Classes\\");
       open_with_key.append(ShellUtil::kFileAssociations[i]);
       open_with_key.append(L"\\OpenWithList\\" + exe_name);
       entries.push_front(new RegistryEntry(open_with_key, std::wstring()));
     }
 
-    // Chrome extension installer
+    // Chrome Extension file handler
     std::wstring install_cmd =
         ShellUtil::GetChromeInstallExtensionCmd(chrome_exe);
     std::wstring prog_id = std::wstring(L"Software\\Classes\\") +
         ShellUtil::kChromeExtProgId;
-
-    // Extension file handler
     entries.push_front(new RegistryEntry(prog_id,
-                                         ShellUtil::kChromeExtProgIdDesc));
+        ShellUtil::kChromeExtProgIdDesc));
     entries.push_front(new RegistryEntry(
-        prog_id + L"\\DefaultIcon", icon_path));
+        prog_id + ShellUtil::kRegDefaultIcon, icon_path));
     entries.push_front(new RegistryEntry(
-        prog_id + L"\\shell\\open\\command", install_cmd));
-
-    // .crx file type extension
-    std::wstring file_extension_key(L"Software\\Classes\\");
-    file_extension_key.append(L".");
-    file_extension_key.append(chrome::kExtensionFileExtension);
-    entries.push_front(new RegistryEntry(file_extension_key,
-                                         ShellUtil::kChromeExtProgId));
+        prog_id + ShellUtil::kRegShellOpen, install_cmd));
 
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     std::wstring start_menu_entry(ShellUtil::kRegStartMenuInternet);
     start_menu_entry.append(L"\\" + dist->GetApplicationName());
     entries.push_front(new RegistryEntry(start_menu_entry,
                                          dist->GetApplicationName()));
     entries.push_front(new RegistryEntry(
         start_menu_entry + ShellUtil::kRegShellOpen, quoted_exe_path));
     entries.push_front(new RegistryEntry(
         start_menu_entry + ShellUtil::kRegDefaultIcon, icon_path));
@@ skipping 18 matching lines @@
     entries.push_front(new RegistryEntry(
         capabilities, L"ApplicationName", dist->GetApplicationName()));
 
     entries.push_front(new RegistryEntry(capabilities + L"\\StartMenu",
         L"StartMenuInternet", dist->GetApplicationName()));
     for (int i = 0; ShellUtil::kFileAssociations[i] != NULL; i++) {
       entries.push_front(new RegistryEntry(
           capabilities + L"\\FileAssociations",
           ShellUtil::kFileAssociations[i], ShellUtil::kChromeHTMLProgId));
     }
+    entries.push_front(new RegistryEntry(
+        capabilities + L"\\FileAssociations",
+        chrome::kExtensionFileExtension, ShellUtil::kChromeExtProgId));
     for (int i = 0; ShellUtil::kProtocolAssociations[i] != NULL; i++) {
       entries.push_front(new RegistryEntry(
           capabilities + L"\\URLAssociations",
           ShellUtil::kProtocolAssociations[i], ShellUtil::kChromeHTMLProgId));
     }
     return entries;
   }
 
   // Generate work_item tasks required to create current registry entry and
   // add them to the given work item list.
@@ skipping 91 matching lines @@
   // file extension associations
   std::wstring classes_path(ShellUtil::kRegClasses);
   for (int i = 0; ShellUtil::kFileAssociations[i] != NULL; i++) {
     std::wstring key_path = classes_path + L"\\" +
                             ShellUtil::kFileAssociations[i];
     items->AddCreateRegKeyWorkItem(root_key, key_path);
     items->AddSetRegValueWorkItem(root_key, key_path, L"",
                                   ShellUtil::kChromeHTMLProgId, true);
   }
 
+  // .crx file type extension
+  std::wstring file_extension_key = classes_path + L"\\." +
+                                    chrome::kExtensionFileExtension;
+  items->AddCreateRegKeyWorkItem(root_key, file_extension_key);
+  items->AddSetRegValueWorkItem(root_key, file_extension_key, L"",
+                                ShellUtil::kChromeExtProgId, true);
+
+
   // protocols associations
   std::wstring chrome_open = ShellUtil::GetChromeShellOpenCmd(chrome_exe);
   std::wstring chrome_icon(chrome_exe);
   ShellUtil::GetChromeIcon(chrome_icon);
   for (int i = 0; ShellUtil::kProtocolAssociations[i] != NULL; i++) {
     std::wstring key_path = classes_path + L"\\" +
                             ShellUtil::kProtocolAssociations[i];
     // <root hkey>\Software\Classes\<protocol>\DefaultIcon
     std::wstring icon_path = key_path + ShellUtil::kRegDefaultIcon;
     items->AddCreateRegKeyWorkItem(root_key, icon_path);
@@ skipping 92 matching lines @@
                                           bool skip_if_not_admin) {
   if (IsUserAnAdmin() &&
       SetAccessDefaultRegEntries(HKEY_LOCAL_MACHINE, chrome_exe))
     return ShellUtil::SUCCESS;
 
   if (!skip_if_not_admin) {
     std::wstring exe_path(file_util::GetDirectoryFromPath(chrome_exe));
     file_util::AppendToPath(&exe_path, installer_util::kSetupExe);
     if (!file_util::PathExists(exe_path)) {
       BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-      RegKey key(HKEY_CURRENT_USER, dist->GetUninstallRegPath().c_str());
+      HKEY reg_root = InstallUtil::IsPerUserInstall(chrome_exe.c_str()) ?
+          HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
+      RegKey key(reg_root, dist->GetUninstallRegPath().c_str());
       key.ReadValue(installer_util::kUninstallStringField, &exe_path);
       CommandLine command_line(L"");
       command_line.ParseFromString(exe_path);
       exe_path = command_line.program();
     }
     if (file_util::PathExists(exe_path)) {
       std::wstring params(L"--");
       params.append(installer_util::switches::kRegisterChromeBrowser);
       params.append(L"=\"" + chrome_exe + L"\"");
       DWORD ret_val = ShellUtil::SUCCESS;
@@ skipping 17 matching lines @@
 const wchar_t* ShellUtil::kRegRegisteredApplications =
     L"Software\\RegisteredApplications";
 const wchar_t* ShellUtil::kRegVistaUrlPrefs =
     L"Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\"
     L"http\\UserChoice";
 const wchar_t* ShellUtil::kAppPathsRegistryKey =
     L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths";
 const wchar_t* ShellUtil::kAppPathsRegistryPathName = L"Path";
 
 #if defined(GOOGLE_CHROME_BUILD)
+const wchar_t* ShellUtil::kChromeExtProgId = L"ChromeExt";
 const wchar_t* ShellUtil::kChromeHTMLProgId = L"ChromeHTML";
 const wchar_t* ShellUtil::kChromeHTMLProgIdDesc = L"Chrome HTML";
 #else
+const wchar_t* ShellUtil::kChromeExtProgId = L"ChromiumExt";
 const wchar_t* ShellUtil::kChromeHTMLProgId = L"ChromiumHTML";
 const wchar_t* ShellUtil::kChromeHTMLProgIdDesc = L"Chromium HTML";
 #endif
 
 const wchar_t* ShellUtil::kFileAssociations[] = {L".htm", L".html", L".shtml",
     L".xht", L".xhtml", NULL};
 const wchar_t* ShellUtil::kProtocolAssociations[] = {L"ftp", L"http", L"https",
     NULL};
 const wchar_t* ShellUtil::kRegUrlProtocol = L"URL Protocol";
 
-const wchar_t* ShellUtil::kChromeExtProgId = L"ChromeExt";
 const wchar_t* ShellUtil::kChromeExtProgIdDesc = L"Chrome Extension Installer";
 
 ShellUtil::RegisterStatus ShellUtil::AddChromeToSetAccessDefaults(
     const std::wstring& chrome_exe, bool skip_if_not_admin) {
   if (IsChromeRegistered(chrome_exe))
     return ShellUtil::SUCCESS;
 
   if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA)
     return RegisterOnVista(chrome_exe, skip_if_not_admin);
 
@@ skipping 274 matching lines @@
   } else {
     return file_util::UpdateShortcutLink(chrome_exe.c_str(),      // target
                                          shortcut.c_str(),        // shortcut
                                          chrome_path.c_str(),     // working dir
                                          NULL,                    // arguments
                                          description.c_str(),     // description
                                          chrome_exe.c_str(),      // icon file
                                          0);                      // icon index
   }
 }