Merge 21428 - Allow two user level installs of Chrome to have default browser...

chrome/installer/setup/install.cc

 // Copyright (c) 2009 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 <shlobj.h>
 #include <time.h>
 
 #include "chrome/installer/setup/install.h"
 
 #include "base/file_util.h"
@@ skipping 278 matching lines @@
 }
 
 void RegisterChromeOnMachine(const std::wstring& install_path,
                              bool system_level,
                              bool make_chrome_default) {
   // Try to add Chrome to Media Player shim inclusion list. We don't do any
   // error checking here because this operation will fail if user doesn't
   // have admin rights and we want to ignore the error.
   AddChromeToMediaPlayerList();
 
-  // We try to register Chrome as a valid browser on local machine. This
-  // will work only if current user has admin rights.
+  // Is --make-chrome-default option is given we make Chrome default browser
+  // otherwise we only register it on the machine as a valid browser.
   std::wstring chrome_exe(install_path);
   file_util::AppendToPath(&chrome_exe, installer_util::kChromeExe);
   LOG(INFO) << "Registering Chrome as browser";
   if (make_chrome_default) {
-    ret = ShellUtil::AddChromeToSetAccessDefaults(chrome_exe, false);
-    if (ret == ShellUtil::SUCCESS) {
-      if (system_level) {
-        ShellUtil::MakeChromeDefault(
-            ShellUtil::CURRENT_USER | ShellUtil::SYSTEM_LEVEL, chrome_exe);
-      } else {
-        ShellUtil::MakeChromeDefault(ShellUtil::CURRENT_USER, chrome_exe);
-      }
-    }
+    int level = ShellUtil::CURRENT_USER;
+    if (system_level)
+      level = level | ShellUtil::SYSTEM_LEVEL;
+    ShellUtil::MakeChromeDefault(level, chrome_exe, true);
   } else {
-    ret = ShellUtil::AddChromeToSetAccessDefaults(chrome_exe, true);
+    ShellUtil::RegisterChromeBrowser(chrome_exe, L"", false);
   }
-  LOG(INFO) << "Return status of Chrome browser registration " << ret;
 }
 }  // namespace
 
 bool installer::InstallNewVersion(const std::wstring& exe_path,
                                   const std::wstring& archive_path,
                                   const std::wstring& src_path,
                                   const std::wstring& install_path,
                                   const std::wstring& temp_dir,
                                   const HKEY reg_root,
                                   const Version& new_version) {
@@ skipping 238 matching lines @@
 }
 
 std::wstring installer::GetInstallerPathUnderChrome(
     const std::wstring& install_path, const std::wstring& new_version) {
   std::wstring installer_path(install_path);
   file_util::AppendToPath(&installer_path, new_version);
   file_util::AppendToPath(&installer_path, installer_util::kInstallerDir);
   return installer_path;
 }