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

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

Issue 10689097: Enforce the 'requirements' field in manifests. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Conforming to the doc Created 8 years, 5 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 dcb1046cfc7d58fc4488769287b85110b2fe3f74..5dbd8dcd7d003e41ae624036b7897552dcc0f621 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -16,6 +16,7 @@
#include "base/scoped_temp_dir.h"
#include "base/stl_util.h"
#include "base/stringprintf.h"
+#include "base/string_util.h"
#include "base/threading/thread_restrictions.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
@@ -29,6 +30,7 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/permissions_updater.h"
+#include "chrome/browser/extensions/requirements_checker.h"
#include "chrome/browser/extensions/webstore_installer.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/shell_integration.h"
@@ -101,7 +103,9 @@ CrxInstaller::CrxInstaller(
creation_flags_(Extension::NO_FLAGS),
off_store_install_allow_reason_(OffStoreInstallDisallowed),
did_handle_successfully_(true),
- record_oauth2_grant_(false) {
+ record_oauth2_grant_(false),
+ error_on_unsported_requirements_(false),
+ requirements_checker_(new extensions::RequirementsChecker()) {
if (!approval)
return;
@@ -384,6 +388,26 @@ void CrxInstaller::OnUnpackSuccess(const FilePath& temp_dir,
&install_icon_);
}
+ BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+ base::Bind(&extensions::RequirementsChecker::Check,
+ base::Unretained(requirements_checker_.get()),
+ extension_,
+ base::Bind(&CrxInstaller::RequirementsChecked, this),
+ BrowserThread::FILE));
+}
+
+void CrxInstaller::RequirementsChecked(std::vector<std::string> errors) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+
+ if (!errors.empty()) {
+ if (error_on_unsported_requirements_) {
+ ReportFailureFromFileThread(CrxInstallerError(
+ UTF8ToUTF16(JoinString(errors, ' '))));
eaugusti 2012/07/26 23:24:13 Errors should probably be joined and formatted bet
+ return;
+ }
+ requirement_errors_.swap(errors);
+ }
+
if (!BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&CrxInstaller::ConfirmInstall, this)))
@@ -520,6 +544,18 @@ void CrxInstaller::CompleteInstall() {
&error);
CHECK(error.empty()) << error;
+ if (!requirement_errors_.empty()) {
+ extensions::Extension::InstallWarningVector install_warnings;
+ std::vector<std::string>::iterator it;
+ for (it = requirement_errors_.begin(); it != requirement_errors_.end();
+ ++it) {
+ install_warnings.push_back(Extension::InstallWarning(
+ Extension::InstallWarning::FORMAT_TEXT, *it));
+ }
+ const_cast<Extension*>(extension_.get())->AddInstallWarnings(
+ install_warnings);
+ }
+
ReportSuccessFromFileThread();
}
@@ -602,8 +638,10 @@ void CrxInstaller::ReportSuccessFromUIThread() {
// Tell the frontend about the installation and hand off ownership of
// extension_ to it.
- frontend_weak_->OnExtensionInstalled(extension_, is_gallery_install(),
- page_ordinal_);
+ frontend_weak_->OnExtensionInstalled(extension_,
+ is_gallery_install(),
+ page_ordinal_,
+ requirement_errors_);
NotifyCrxInstallComplete(extension_.get());

Powered by Google App Engine
This is Rietveld 408576698