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

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

Issue 2783813002: Move ChromeRequirementsChecker to //extensions as a PreloadCheck (Closed)
Patch Set: rebase? Created 3 years, 8 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
Index: chrome/browser/extensions/crx_installer.cc
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index beb79a7c226fc12c0c5a10f86980da018484da2e..05462ce54952023d8afb93524cc9f1de1bc53c69 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -526,12 +526,11 @@ void CrxInstaller::OnInstallChecksComplete(int failed_checks) {
return;
// Check for requirement errors.
- if (!install_checker_->requirement_errors().empty()) {
+ if (!install_checker_->requirements_error_message().empty()) {
if (error_on_unsupported_requirements_) {
ReportFailureFromUIThread(
CrxInstallError(CrxInstallError::ERROR_DECLINED,
- base::UTF8ToUTF16(base::JoinString(
- install_checker_->requirement_errors(), " "))));
+ install_checker_->requirements_error_message()));
return;
}
install_flags_ |= kInstallFlagHasRequirementErrors;
@@ -569,9 +568,8 @@ void CrxInstaller::OnInstallChecksComplete(int failed_checks) {
// Note: |client_| can be NULL in unit_tests!
if (extension()->from_webstore() && client_)
client_->install_ui()->SetSkipPostInstallUI(true);
- ReportFailureFromUIThread(
- CrxInstallError(CrxInstallError::ERROR_DECLINED,
- base::UTF8ToUTF16(install_checker_->policy_error())));
+ ReportFailureFromUIThread(CrxInstallError(
+ CrxInstallError::ERROR_DECLINED, install_checker_->policy_error()));
return;
}
« no previous file with comments | « chrome/browser/extensions/chrome_requirements_checker.cc ('k') | chrome/browser/extensions/extension_install_checker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698