Index: chrome/browser/shell_integration_mac.mm |
diff --git a/chrome/browser/shell_integration_mac.mm b/chrome/browser/shell_integration_mac.mm |
index 2ae55e18078079044e4332a91c21e57ae5ca6b69..ce7cc7ed78565aa3af153ce73f2cbdc11368ae95 100644 |
--- a/chrome/browser/shell_integration_mac.mm |
+++ b/chrome/browser/shell_integration_mac.mm |
@@ -53,7 +53,7 @@ bool IsIdentifierDefaultProtocolClient(NSString* identifier, |
// applies only for the current user. Returns false if this cannot be done, or |
// if the operation fails. |
bool SetAsDefaultBrowser() { |
- if (CanSetAsDefaultBrowser() != SET_DEFAULT_UNATTENDED) |
+ if (CanSetAsDefaultBrowser()) |
return false; |
// We really do want the outer bundle here, not the main bundle since setting |
@@ -89,12 +89,12 @@ bool SetAsDefaultProtocolClient(const std::string& protocol) { |
return return_code == noErr; |
} |
-DefaultWebClientSetPermission CanSetAsDefaultBrowser() { |
- if (chrome::GetChannel() != version_info::Channel::CANARY) { |
- return SET_DEFAULT_UNATTENDED; |
+DefaultWebClientSetPermission GetDefaultWebClientSetPermission() { |
+ if (chrome::GetChannel() == version_info::Channel::CANARY) { |
+ return SET_DEFAULT_NOT_ALLOWED; |
} |
- return SET_DEFAULT_NOT_ALLOWED; |
+ return SET_DEFAULT_UNATTENDED; |
} |
base::string16 GetApplicationNameForProtocol(const GURL& url) { |