Allow two user level installs of Chrome to have default browser settings.

chrome/browser/shell_integration.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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 "chrome/browser/shell_integration.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <shobjidl.h>
 
 #include "app/win_util.h"
@@ skipping 14 matching lines @@
 #include "chrome/installer/util/work_item.h"
 #include "chrome/installer/util/work_item_list.h"
 
 bool ShellIntegration::SetAsDefaultBrowser() {
   std::wstring chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     LOG(ERROR) << "Error getting app exe path";
     return false;
   }
 
-  ShellUtil::RegisterStatus register_status =
-      ShellUtil::AddChromeToSetAccessDefaults(chrome_exe, false);
-  if (register_status == ShellUtil::FAILURE) {
-    LOG(ERROR) << "Chrome could not be registered on the machine.";
-    return false;
-  }
-
   // From UI currently we only allow setting default browser for current user.
-  if (!ShellUtil::MakeChromeDefault(ShellUtil::CURRENT_USER, chrome_exe)) {
+  if (!ShellUtil::MakeChromeDefault(ShellUtil::CURRENT_USER,
+                                    chrome_exe, true)) {
     LOG(ERROR) << "Chrome could not be set as default browser.";
     return false;
   }
 
   LOG(INFO) << "Chrome registered as default browser.";
   return true;
 }
 
 bool ShellIntegration::IsDefaultBrowser() {
   // First determine the app path. If we can't determine what that is, we have
@@ skipping 15 matching lines @@
   const std::wstring kChromeProtocols[] = {L"http", L"https"};
 
   if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
     IApplicationAssociationRegistration* pAAR;
     HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
         NULL, CLSCTX_INPROC, __uuidof(IApplicationAssociationRegistration),
         (void**)&pAAR);
     if (!SUCCEEDED(hr))
       return false;
 
+    BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+    std::wstring app_name = dist->GetApplicationName();
+    std::wstring app_name_with_suffix;
+    ShellUtil::GetUserSpecificDefaultBrowserSuffix(&app_name_with_suffix);
+    app_name_with_suffix = app_name + app_name_with_suffix;
     for (int i = 0; i < _countof(kChromeProtocols); i++) {
       BOOL result = TRUE;
-      BrowserDistribution* dist = BrowserDistribution::GetDistribution();
       hr = pAAR->QueryAppIsDefault(kChromeProtocols[i].c_str(), AT_URLPROTOCOL,
-        AL_EFFECTIVE, dist->GetApplicationName().c_str(), &result);
+          AL_EFFECTIVE, app_name_with_suffix.c_str(), &result);
       if (!SUCCEEDED(hr) || (result == FALSE)) {
-        pAAR->Release();
-        return false;
+        hr = pAAR->QueryAppIsDefault(kChromeProtocols[i].c_str(),
+            AT_URLPROTOCOL, AL_EFFECTIVE, app_name.c_str(), &result);
+        if (!SUCCEEDED(hr) || (result == FALSE)) {
+          pAAR->Release();
+          return false;
+        }
       }
     }
     pAAR->Release();
   } else {
     std::wstring short_app_path;
     GetShortPathName(app_path.c_str(), WriteInto(&short_app_path, MAX_PATH),
                      MAX_PATH);
 
     // open command for protocol associations
     for (int i = 0; i < _countof(kChromeProtocols); i++) {
@@ skipping 46 matching lines @@
     std::wstring key_path(L"http");
     key_path.append(ShellUtil::kRegShellOpen);
     RegKey key(HKEY_CLASSES_ROOT, key_path.c_str(), KEY_READ);
     std::wstring app_cmd;
     if (key.Valid() && key.ReadValue(L"", &app_cmd) &&
         std::wstring::npos != StringToLowerASCII(app_cmd).find(L"firefox"))
       ff_default = true;
   }
   return ff_default;
 }