Support for interactive set-chrome-as-default in Windows.

chrome/browser/shell_integration_mac.mm

 // 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 "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/foundation_util.h"
 #include "chrome/common/chrome_version_info.h"
 #import "third_party/mozilla/NSWorkspace+Utils.h"
 
-bool ShellIntegration::CanSetAsDefaultBrowser() {
-  return chrome::VersionInfo::GetChannel() !=
-      chrome::VersionInfo::CHANNEL_CANARY;
+ShellIntegration::DefaultSettingsChangePermission
+    ShellIntegration::CanSetAsDefaultBrowser() {
+  if (chrome::VersionInfo::GetChannel() !=
+          chrome::VersionInfo::CHANNEL_CANARY) {
+    return CHANGE_DEFAULT_UNATTENDED;
+  }
+
+  return CHANGE_DEFAULT_NOT_ALLOWED;
 }
 
 // Sets Chromium as default browser to be used by the operating system. This
 // applies only for the current user. Returns false if this cannot be done, or
 // if the operation fails.
 bool ShellIntegration::SetAsDefaultBrowser() {
-  if (!CanSetAsDefaultBrowser())
+  if (CanSetAsDefaultBrowser() != CHANGE_DEFAULT_UNATTENDED)
     return false;
 
   // We really do want the outer bundle here, not the main bundle since setting
   // a shortcut to Chrome as the default browser doesn't make sense.
   NSString* identifier = [base::mac::OuterBundle() bundleIdentifier];
   if (!identifier)
     return false;
 
   [[NSWorkspace sharedWorkspace] setDefaultBrowserWithIdentifier:identifier];
   return true;
 }
 
 // Sets Chromium as the default application to be used by the operating system
 // for the given protocol. This applies only for the current user. Returns false
 // if this cannot be done, or if the operation fails.
 bool ShellIntegration::SetAsDefaultProtocolClient(const std::string& protocol) {
   if (protocol.empty())
     return false;
 
-  if (!CanSetAsDefaultProtocolClient())
+  if (CanSetAsDefaultBrowser() != CHANGE_DEFAULT_UNATTENDED)

[grt (UTC plus 2), 2012/06/01 14:36:39]

CanSetAsDefaultBrowser -> CanSetAsDefaultProtocolClient

[motek., 2012/06/01 20:50:17]

Done.

     return false;
 
   // We really do want the main bundle here since it makes sense to set an
   // app shortcut as a default protocol handler.
   NSString* identifier = [base::mac::MainBundle() bundleIdentifier];
   if (!identifier)
     return false;
 
   NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];
   OSStatus return_code =
@@ skipping 68 matching lines @@
   // We really do want the main bundle here since it makes sense to set an
   // app shortcut as a default protocol handler.
   NSString* my_identifier = [base::mac::MainBundle() bundleIdentifier];
   if (!my_identifier)
     return UNKNOWN_DEFAULT_WEB_CLIENT;
 
   NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];
   return IsIdentifierDefaultProtocolClient(my_identifier, protocol_ns) ?
       IS_DEFAULT_WEB_CLIENT : NOT_DEFAULT_WEB_CLIENT;
 }