Fix registerProtocolHandler OS registration on Windows 8

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 443 matching lines @@
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   if (!ShellUtil::ShowMakeChromeDefaultSystemUI(dist, chrome_exe.value())) {
     LOG(ERROR) << "Failed to launch the set-default-browser Windows UI.";
     return false;
   }
 
   VLOG(1) << "Set-as-default Windows UI triggered.";
   return true;
 }
 
+bool ShellIntegration::SetAsDefaultProtocolClientInteractive(
+    const std::string& protocol) {
+  FilePath chrome_exe;
+  if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+    NOTREACHED() << "Error getting app exe path";
+    return false;
+  }
+
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  string16 wprotocol = UTF8ToUTF16(protocol);

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

nit: string16 wprotocol(UTF8ToUTF16(protocol));

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

Done.

+  if (!ShellUtil::ShowMakeChromeDefaultProtocolClientSystemUI(
+      dist, chrome_exe.value(), wprotocol)) {

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

nit: indent four additional spaces.

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

Done.

+    LOG(ERROR) << "Failed to launch the set-default Windows UI.";
+    return false;
+  }
+
+  VLOG(1) << "Set-as-default Windows UI triggered.";

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

I think it's more informative for "triggered" to be "completed" since
ShowMakeBlah is a blocking call.  If you agree, please make the change here and
on line 460.  Thanks.

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

Done.

+  return true;
+}
+
 ShellIntegration::DefaultWebClientState ShellIntegration::IsDefaultBrowser() {
   // When we check for default browser we don't necessarily want to count file
   // type handlers and icons as having changed the default browser status,
   // since the user may have changed their shell settings to cause HTML files
   // to open with a text editor for example. We also don't want to aggressively
   // claim FTP, since the user may have a separate FTP client. It is an open
   // question as to how to "heal" these settings. Perhaps the user should just
   // re-run the installer or run with the --set-default-browser command line
   // flag. There is doubtless some other key we can hook into to cause "Repair"
   // to show up in Add/Remove programs for us.
@@ skipping 112 matching lines @@
       continue;
     }
 
     shortcut = shortcut.Append(shortcut_name).Append(shortcut_name + L".lnk");
     if (file_util::PathExists(shortcut))
       return shortcut;
   }
 
   return FilePath();
 }