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 56 matching lines @@
 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;
 
   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();

[grt (UTC plus 2), 2012/05/30 20:37:40]

It would be nice to abstract the whole idea of the suffix away from consumers of
ShellUtil.  How about adding these method to ShellUtil for use by
shell_integration_win and others:

  static string16 GetProgId(BrowserDistribution*);
  static string16 GetApplicationName(BrowserDistribution*);

[gab, 2012/05/31 06:36:01]

Yea, I'm not sure functions in ShellUtil would serve that purpose though as the
consumers could still call the functions from BrowserDistribution not knowing
about our extra function.

I think the best way to fix this is through the template design pattern in
browser_distribution.h/cc:

Have browser_distribution.h/cc define and implement two public functions:
GetSuffixedAppId()
GetSuffixedApplicationName()
which are final (i.e. non-overridable, I used to do this all-the-time in Java,
not sure about C++)

Then move the current two functions to private.

And have the implementation in browser_distribution.cc of
GetSuffixedAppId()+GetSuffixedApplicationName() do the suffixing of the appid it
gets from the privately overriden non-suffixed getters (i.e. all the actual
browser distributions still return static strings and "do no work" as desired).

[gab, 2012/06/01 00:16:01]

Ok, I added this in http://codereview.chromium.org/10446111/, which I'd like to
checkin after this patch (I don't want to bloat up this CL with that change, but
on the other hand it's easier to base it on top of the new suffixing code than
making it work with the old one, checking it in, and adapt this CL to it
after...)

Let me know if that works for you.

 
   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();
   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();
 
   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 403 matching lines @@
 }
 
 void ShellIntegration::MigrateChromiumShortcuts() {
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return;
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&MigrateChromiumShortcutsCallback));
 }