Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4173)

Unified Diff: chrome/browser/extensions/crx_installer.cc

Issue 2737053002: Update ExtensionInstallChecker to use PreloadCheck classes (Closed)
Patch Set: rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/crx_installer.h ('k') | chrome/browser/extensions/extension_install_checker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/crx_installer.cc
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index 53a9677c6eee1b2956629a77663dc52d4fbce80a..b8f708f1981bd21a0327815cc472491507042ceb 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -49,6 +49,7 @@
#include "extensions/browser/install/extension_install_ui.h"
#include "extensions/browser/install_flag.h"
#include "extensions/browser/notification_types.h"
+#include "extensions/browser/preload_check.h"
#include "extensions/common/extension_icon_set.h"
#include "extensions/common/file_util.h"
#include "extensions/common/manifest.h"
@@ -539,12 +540,13 @@ void CrxInstaller::OnInstallChecksComplete(int failed_checks) {
}
// Check the blacklist state.
- if (install_checker_->blacklist_state() == BLACKLISTED_MALWARE) {
+ if (install_checker_->blacklist_error() == PreloadCheck::BLACKLISTED_ID) {
install_flags_ |= kInstallFlagIsBlacklistedForMalware;
}
- if ((install_checker_->blacklist_state() == BLACKLISTED_MALWARE ||
- install_checker_->blacklist_state() == BLACKLISTED_UNKNOWN) &&
+ if ((install_checker_->blacklist_error() == PreloadCheck::BLACKLISTED_ID ||
+ install_checker_->blacklist_error() ==
+ PreloadCheck::BLACKLISTED_UNKNOWN) &&
!allow_silent_install_) {
// User tried to install a blacklisted extension. Show an error and
// refuse to install it.
« no previous file with comments | « chrome/browser/extensions/crx_installer.h ('k') | chrome/browser/extensions/extension_install_checker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698