diff options
| author | oleg@chromium.org <oleg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 17:49:07 +0000 |
|---|---|---|
| committer | oleg@chromium.org <oleg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 17:49:07 +0000 |
| commit | 8e289f0bc9dcf0a2c643ea8ae123f5f4351200bb (patch) | |
| tree | 7832102f499711da0d3793d5d08babfbc251023d /chrome/browser/extensions/crx_installer.cc | |
| parent | 980d5f9e98cc7a20ed8483697bb6efa5c0451ac2 (diff) | |
| download | chromium_src-8e289f0bc9dcf0a2c643ea8ae123f5f4351200bb.zip chromium_src-8e289f0bc9dcf0a2c643ea8ae123f5f4351200bb.tar.gz chromium_src-8e289f0bc9dcf0a2c643ea8ae123f5f4351200bb.tar.bz2 | |
BUG=267514
Design doc: https://docs.google.com/a/google.com/document/d/1oDS8nT2hj6tOAnhK-sZpK5sIhfc3RPaapzRw1Fb0sng
Review URL: https://codereview.chromium.org/49253005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241316 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/crx_installer.cc')
| -rw-r--r-- | chrome/browser/extensions/crx_installer.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index cdc45e5..818fa8f 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -126,7 +126,7 @@ CrxInstaller::CrxInstaller( did_handle_successfully_(true), error_on_unsupported_requirements_(false), has_requirement_errors_(false), - blacklist_state_(extensions::Blacklist::NOT_BLACKLISTED), + blacklist_state_(extensions::NOT_BLACKLISTED), install_wait_for_idle_(true), update_from_settings_page_(false), installer_(service_weak->profile()) { @@ -519,14 +519,15 @@ void CrxInstaller::OnRequirementsChecked( } void CrxInstaller::OnBlacklistChecked( - extensions::Blacklist::BlacklistState blacklist_state) { + extensions::BlacklistState blacklist_state) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); if (!service_weak_) return; blacklist_state_ = blacklist_state; - if (blacklist_state_ == extensions::Blacklist::BLACKLISTED_MALWARE && + if ((blacklist_state_ == extensions::BLACKLISTED_MALWARE || + blacklist_state_ == extensions::BLACKLISTED_UNKNOWN) && !allow_silent_install_) { // User tried to install a blacklisted extension. Show an error and // refuse to install it. |