Prototype version of the first-run dialog for 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 598 matching lines @@
     }
   }
   return true;
 }
 
 // Launches the Windows 7 and Windows 8 dialog for picking the application to
 // handle the given protocol. Most importantly, this is used to set the default
 // handler for http (and, implicitly with it, https). In that case it is also
 // known as the 'how do you want to open webpages' dialog.
 // It is required that Chrome be already *registered* for the given protocol.
-bool LaunchSelectDefaultProtocolHandlerDialog(const wchar_t* protocol) {
+HRESULT LaunchSelectDefaultProtocolHandlerDialog(const wchar_t* protocol) {
   DCHECK(protocol);
   OPENASINFO open_as_info = {};
   open_as_info.pcszFile = protocol;
   open_as_info.oaifInFlags =
       OAIF_URL_PROTOCOL | OAIF_FORCE_REGISTRATION | OAIF_REGISTER_EXT;
   HRESULT hr = SHOpenWithDialog(NULL, &open_as_info);
   DLOG_IF(WARNING, FAILED(hr)) << "Failed to set as default " << protocol
       << " handler; hr=0x" << std::hex << hr;
-  return SUCCEEDED(hr);
+  return hr;
 }
 
 // Launches the Windows 7 and Windows 8 application association dialog, which
 // is the only documented way to make a browser the default browser on
 // Windows 8.
 bool LaunchApplicationAssociationDialog(const string16& app_id) {
   base::win::ScopedComPtr<IApplicationAssociationRegistrationUI> aarui;
   HRESULT hr = aarui.CreateInstance(CLSID_ApplicationAssociationRegistrationUI);
   if (FAILED(hr))
     return false;
@@ skipping 411 matching lines @@
 
   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.
-  return LaunchSelectDefaultProtocolHandlerDialog(L"http");
+  // Return true only when the user took an action and there was no error.
+  return LaunchSelectDefaultProtocolHandlerDialog(L"http") == S_OK;

[grt (UTC plus 2), 2012/06/18 19:19:13]

use SUCCEEDED() macro rather than comparing to S_OK

[motek., 2012/06/19 18:06:44]

Yeah, obviously. I am not sure what made me believe that cancelling/off-clicking
would result in S_FALSE. In fact, it is a negative code (0x8...).
I've reverted to the previous state.

 }
 
 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);
 
@@ skipping 253 matching lines @@
       chrome_exe.c_str(),
       shortcut.c_str(),
       chrome_path.c_str(),
       arguments.c_str(),
       description.c_str(),
       icon_path.c_str(),
       icon_index,
       dist->GetBrowserAppId().c_str(),
       ConvertShellUtilShortcutOptionsToFileUtil(options));
 }