Chromium Code Reviews| Index: chrome/browser/extensions/external_install_manager.cc |
| diff --git a/chrome/browser/extensions/external_install_manager.cc b/chrome/browser/extensions/external_install_manager.cc |
| index 802627aa47666abdf178314adb3136e5e7989a7a..26a4d0be32c74e3bddfe34e83b814a752e5a9c86 100644 |
| --- a/chrome/browser/extensions/external_install_manager.cc |
| +++ b/chrome/browser/extensions/external_install_manager.cc |
| @@ -84,6 +84,16 @@ ExternalInstallManager::ExternalInstallManager( |
| ExternalInstallManager::~ExternalInstallManager() { |
| } |
| + |
| +bool ExternalInstallManager::IsPromptingEnabled() { |
| + // Enable this feature on canary on mac. |
| +#if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD) |
| + return GetCurrentChannel() < version_info::Channel::CANARY; |
|
lazyboy
2017/01/11 01:46:40
Did you mean <= ?
Devlin
2017/01/11 15:53:33
I did, good catch! Done.
|
| +#else |
| + return FeatureSwitch::prompt_for_external_extensions()->IsEnabled(); |
| +#endif |
| +} |
| + |
| void ExternalInstallManager::AddExternalInstallError(const Extension* extension, |
| bool is_new_profile) { |
| // Error already exists or has been previously shown. |
| @@ -116,7 +126,7 @@ void ExternalInstallManager::RemoveExternalInstallError( |
| void ExternalInstallManager::UpdateExternalExtensionAlert() { |
| // If the feature is not enabled do nothing. |
| - if (!FeatureSwitch::prompt_for_external_extensions()->IsEnabled()) |
| + if (!IsPromptingEnabled()) |
| return; |
| // Look for any extensions that were disabled because of being unacknowledged |
| @@ -219,7 +229,7 @@ void ExternalInstallManager::OnExtensionUninstalled( |
| bool ExternalInstallManager::IsUnacknowledgedExternalExtension( |
| const Extension& extension) const { |
| - if (!FeatureSwitch::prompt_for_external_extensions()->IsEnabled()) |
| + if (!IsPromptingEnabled()) |
| return false; |
| int disable_reasons = extension_prefs_->GetDisableReasons(extension.id()); |