Always suffix ChromeHTML entries on Windows for user-level installs.

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 <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
@@ skipping 57 matching lines @@
 // As a result, stale ProgIDs could be returned, leading to false positives.
 ShellIntegration::DefaultWebClientState ProbeCurrentDefaultHandlers(
     const wchar_t* const* protocols,
     size_t num_protocols) {
   base::win::ScopedComPtr<IApplicationAssociationRegistration> registration;
   HRESULT hr = registration.CreateInstance(
       CLSID_ApplicationAssociationRegistration, NULL, CLSCTX_INPROC);
   if (FAILED(hr))
     return ShellIntegration::UNKNOWN_DEFAULT_WEB_CLIENT;
 
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  FilePath chrome_exe;
+  if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+    NOTREACHED();
+    return ShellIntegration::UNKNOWN_DEFAULT_WEB_CLIENT;
+  }
   string16 prog_id(ShellUtil::kChromeHTMLProgId);
-
-  // If a user specific default browser entry exists, we check for that ProgID
-  // being default. If not, then the ProgID is ChromeHTML or ChromiumHTML so we
-  // do not append a suffix to the ProgID.
-  string16 suffix;
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  if (ShellUtil::GetUserSpecificDefaultBrowserSuffix(dist, &suffix))
-    prog_id += suffix;
+  prog_id += ShellUtil::GetCurrentInstallationSuffix(dist, chrome_exe.value());
 
   for (size_t i = 0; i < num_protocols; ++i) {
     base::win::ScopedCoMem<wchar_t> current_app;
     hr = registration->QueryCurrentDefault(protocols[i], AT_URLPROTOCOL,
                                            AL_EFFECTIVE, &current_app);
     if (FAILED(hr) || prog_id.compare(current_app) != 0)
       return ShellIntegration::NOT_DEFAULT_WEB_CLIENT;
   }
 
   return ShellIntegration::IS_DEFAULT_WEB_CLIENT;
 }
 
 // Probe using IApplicationAssociationRegistration::QueryAppIsDefault (Vista and
 // Windows 7); see ProbeProtocolHandlers.
 ShellIntegration::DefaultWebClientState ProbeAppIsDefaultHandlers(
     const wchar_t* const* protocols,
     size_t num_protocols) {
   base::win::ScopedComPtr<IApplicationAssociationRegistration> registration;
   HRESULT hr = registration.CreateInstance(
       CLSID_ApplicationAssociationRegistration, NULL, CLSCTX_INPROC);
   if (FAILED(hr))
     return ShellIntegration::UNKNOWN_DEFAULT_WEB_CLIENT;
 
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  FilePath chrome_exe;
+  if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+    NOTREACHED();
+    return ShellIntegration::UNKNOWN_DEFAULT_WEB_CLIENT;
+  }
   string16 app_name(dist->GetApplicationName());
-
-  // If a user specific default browser entry exists, we check for that
-  // app name being default. If not, then default browser is just called
-  // Google Chrome or Chromium so we do not append a suffix to the app name.
-  string16 suffix;
-  if (ShellUtil::GetUserSpecificDefaultBrowserSuffix(dist, &suffix))
-    app_name += suffix;
+  app_name += ShellUtil::GetCurrentInstallationSuffix(dist, chrome_exe.value());
 
   BOOL result;
   for (size_t i = 0; i < num_protocols; ++i) {
     result = TRUE;
     hr = registration->QueryAppIsDefault(protocols[i], AT_URLPROTOCOL,
         AL_EFFECTIVE, app_name.c_str(), &result);
     if (FAILED(hr) || result == FALSE)
       return ShellIntegration::NOT_DEFAULT_WEB_CLIENT;
   }
 
@@ skipping 467 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&MigrateChromiumShortcutsCallback));
 }
 
 bool ShellIntegration::ActivateMetroChrome() {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   const string16 app_id(dist->GetBrowserAppId());
   return ActivateApplication(app_id);
 }