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

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

Issue 9456019: Add GTK interface for installing bundles of extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix compile Created 8 years, 10 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/bundle_installer.cc ('k') | chrome/browser/extensions/extension_install_dialog.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 a3edce806e27f230aca4d48cf5aa432854eb1a79..2f42cce53b8e91c8c0fb823518ec87f574274e15 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -417,16 +417,17 @@ void CrxInstaller::ConfirmInstall() {
scoped_ptr<CrxInstaller::WhitelistEntry> entry(
RemoveWhitelistEntry(extension_->id()));
if (is_gallery_install() && entry.get() && original_manifest_.get()) {
- if (!(original_manifest_->Equals(entry->parsed_manifest.get()))) {
- ReportFailureFromUIThread(
- l10n_util::GetStringUTF16(IDS_EXTENSION_MANIFEST_INVALID));
- return;
- }
whitelisted = true;
if (entry->use_app_installed_bubble)
client_->set_use_app_installed_bubble(true);
if (entry->skip_post_install_ui)
client_->set_skip_post_install_ui(true);
+
+ if (!(original_manifest_->Equals(entry->parsed_manifest.get()))) {
+ ReportFailureFromUIThread(
+ l10n_util::GetStringUTF16(IDS_EXTENSION_MANIFEST_INVALID));
+ return;
+ }
}
if (client_ &&
« no previous file with comments | « chrome/browser/extensions/bundle_installer.cc ('k') | chrome/browser/extensions/extension_install_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698