Fix registerProtocolHandler OS registration on Windows 8

chrome/installer/util/shell_util.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.
 //
 // 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 "chrome/installer/util/shell_util.h"
@@ skipping 893 matching lines @@
   // Chrome as default browser at system level.
   if ((shell_change & ShellUtil::SYSTEM_LEVEL) &&
       !AddRegistryEntries(HKEY_LOCAL_MACHINE, entries)) {
     ret = false;
     LOG(ERROR) << "Could not make Chrome default browser (XP/system level).";
   }
 
   return ret;
 }
 
+bool RegisterChromeAsDefaultProtocolClientForXP(BrowserDistribution* dist,

[grt (UTC plus 2), 2012/09/20 13:10:13]

please add a comment for the function directing the reader to
http://msdn.microsoft.com/library/aa767914.aspx for reference.

[benwells, 2012/09/21 01:15:20]

Done.

+                                                const string16& chrome_exe,
+                                                const string16& protocol) {
+  ScopedVector<RegistryEntry> entries;
+  const string16 suffix(ShellUtil::GetCurrentInstallationSuffix(dist,

[grt (UTC plus 2), 2012/09/20 13:10:13]

suffix is never used, please remove.

[benwells, 2012/09/21 01:15:20]

Done.

+                                                                chrome_exe));
+  const string16 chrome_open(ShellUtil::GetChromeShellOpenCmd(chrome_exe));
+  const string16 chrome_icon(ShellUtil::GetChromeIcon(dist, chrome_exe));
+  RegistryEntry::GetUserProtocolEntries(protocol, chrome_icon, chrome_open,
+                                        &entries);
+  // Change the default protocol handler for current user.
+  if (!AddRegistryEntries(HKEY_CURRENT_USER, entries)) {
+      LOG(ERROR) << "Could not make Chrome default protocol client (XP).";

[grt (UTC plus 2), 2012/09/20 13:10:13]

nit: de-indent two spaces

[benwells, 2012/09/21 01:15:20]

Done.

+      return false;
+  }
+
+  return true;
+}
+
 }  // namespace
 
 const wchar_t* ShellUtil::kRegDefaultIcon = L"\\DefaultIcon";
 const wchar_t* ShellUtil::kRegShellPath = L"\\shell";
 const wchar_t* ShellUtil::kRegShellOpen = L"\\shell\\open\\command";
 const wchar_t* ShellUtil::kRegStartMenuInternet =
     L"Software\\Clients\\StartMenuInternet";
 const wchar_t* ShellUtil::kRegClasses = L"Software\\Classes";
 const wchar_t* ShellUtil::kRegRegisteredApplications =
     L"Software\\RegisteredApplications";
@@ skipping 424 matching lines @@
     return false;
 
   if (!RegisterChromeBrowser(dist, chrome_exe, string16(), true))
       return false;
 
   // On Windows 8, you can't set yourself as the default handler
   // programatically. In other words IApplicationAssociationRegistration
   // has been rendered useless. What you can do is to launch
   // "Set Program Associations" section of the "Default Programs"
   // control panel, which is a mess, or pop the concise "How you want to open
-  // webpages?" dialog.  We choose the latter.
+  // links of this type (protocol)?" dialog.  We choose the latter.

[grt (UTC plus 2), 2012/09/20 13:10:13]

Looks like this is the text for line 1452 (and vice-versa).

[benwells, 2012/09/21 01:15:20]

Done.

   // Return true only when the user took an action and there was no error.
   const bool ret = LaunchSelectDefaultProtocolHandlerDialog(L"http");
 
   if (ret) {
     const int shell_change =
         InstallUtil::IsPerUserInstall(chrome_exe.c_str()) ? CURRENT_USER :
                                                             SYSTEM_LEVEL;
     RegisterChromeAsDefaultForXP(dist, shell_change, chrome_exe);
   }
 
   return ret;
 }
 
 bool ShellUtil::MakeChromeDefaultProtocolClient(BrowserDistribution* dist,
                                                 const string16& chrome_exe,
                                                 const string16& protocol) {
   if (!dist->CanSetAsDefault())
     return false;
 
-  ShellUtil::RegisterChromeForProtocol(dist, chrome_exe, L"", protocol, true);
+  if (!RegisterChromeForProtocol(dist, chrome_exe, L"", protocol, true))

[grt (UTC plus 2), 2012/09/20 13:10:13]

L"" -> string16()

[benwells, 2012/09/21 01:15:20]

Done.

+    return false;
+
+  // Windows 8 does not permit making a browser default just like that.
+  // This process needs to be routed through the system's UI. Use
+  // ShowMakeChromeDefaultProocolClientSystemUI instead (below).
+  if (!CanMakeChromeDefaultUnattended())
+    return false;
 
   bool ret = true;
   // First use the new "recommended" way on Vista to make Chrome default
   // protocol handler.
   if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
     VLOG(1) << "Registering Chrome as default handler for " << protocol
             << " on Vista.";
     base::win::ScopedComPtr<IApplicationAssociationRegistration> pAAR;
     HRESULT hr = pAAR.CreateInstance(CLSID_ApplicationAssociationRegistration,
       NULL, CLSCTX_INPROC);
     if (SUCCEEDED(hr)) {
       string16 app_name = GetApplicationName(dist, chrome_exe);
       hr = pAAR->SetAppAsDefault(app_name.c_str(), protocol.c_str(),
                                  AT_URLPROTOCOL);
     }
     if (!SUCCEEDED(hr)) {
       ret = false;
       LOG(ERROR) << "Could not make Chrome default protocol client (Vista):"
                  << " HRESULT=" << hr << ".";
     }
   }
 
   // Now use the old way to associate Chrome with the desired protocol. This
   // should not be required on Vista but since some applications still read
   // Software\Classes\http key directly, we have to do this on Vista also.
-
-  ScopedVector<RegistryEntry> entries;
-  const string16 suffix(GetCurrentInstallationSuffix(dist, chrome_exe));
-  const string16 chrome_open(ShellUtil::GetChromeShellOpenCmd(chrome_exe));
-  const string16 chrome_icon(ShellUtil::GetChromeIcon(dist, chrome_exe));
-  RegistryEntry::GetUserProtocolEntries(protocol, chrome_icon, chrome_open,
-                                        &entries);
-  // Change the default protocol handler for current user.
-  if (!AddRegistryEntries(HKEY_CURRENT_USER, entries)) {
-      ret = false;
-      LOG(ERROR) << "Could not make Chrome default protocol client (XP).";
-  }
+  if (!RegisterChromeAsDefaultProtocolClientForXP(dist, chrome_exe, protocol))
+    ret = false;
 
   return ret;
 }
+
+bool ShellUtil::ShowMakeChromeDefaultProtocolClientSystemUI(
+    BrowserDistribution* dist,
+    const string16& chrome_exe,
+    const string16& protocol) {
+  DCHECK_GE(base::win::GetVersion(), base::win::VERSION_WIN8);
+  if (!dist->CanSetAsDefault())
+    return false;
+
+  if (!RegisterChromeForProtocol(dist, chrome_exe, L"", protocol, true))

[grt (UTC plus 2), 2012/09/20 13:10:13]

L"" -> string16()

[benwells, 2012/09/21 01:15:20]

Done.

+      return false;

[grt (UTC plus 2), 2012/09/20 13:10:13]

de-indent two spaces

[benwells, 2012/09/21 01:15:20]

Done.

+
+  // On Windows 8, you can't set yourself as the default handler
+  // programatically. In other words IApplicationAssociationRegistration
+  // has been rendered useless. What you can do is to launch
+  // "Set Program Associations" section of the "Default Programs"
+  // control panel, which is a mess, or pop the concise "How you want to open
+  // webpages?" dialog.  We choose the latter.
+  // Return true only when the user took an action and there was no error.
+  const bool ret = LaunchSelectDefaultProtocolHandlerDialog(protocol.c_str());
+
+  if (ret)
+    RegisterChromeAsDefaultProtocolClientForXP(dist, chrome_exe, protocol);
+
+  return ret;
+}
 
 bool ShellUtil::RegisterChromeBrowser(BrowserDistribution* dist,
                                       const string16& chrome_exe,
                                       const string16& unique_suffix,
                                       bool elevate_if_not_admin) {
   if (!dist->CanSetAsDefault())
     return false;
 
   string16 suffix;
   if (!unique_suffix.empty()) {
@@ skipping 315 matching lines @@
     // are any left...).
     if (free_bits >= 8 && next_byte_index < size) {
       free_bits -= 8;
       bit_stream += bytes[next_byte_index++] << free_bits;
     }
   }
 
   DCHECK_EQ(ret.length(), encoded_length);
   return ret;
 }