summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorelijahtaylor <elijahtaylor@chromium.org>2015-02-11 13:41:09 -0800
committerelijahtaylor <elijahtaylor@chromium.org>2015-02-11 21:42:34 +0000
commit22db84644b6bf1574683c13ccf62291e331da302 (patch)
treec46c72449cc34ac10a37a9ce1e1acd907ade1c64
parent2c5d9d74513b61c70aad673efe972bd3e8c83b52 (diff)
downloadchromium_src-22db84644b6bf1574683c13ccf62291e331da302.zip
chromium_src-22db84644b6bf1574683c13ccf62291e331da302.tar.gz
chromium_src-22db84644b6bf1574683c13ccf62291e331da302.tar.bz2
Add ID to dummy extension during permission check
This is important so that the permissions will be consistent between the dummy extension and the extension that is about to be installed. BUG=450896 Review URL: https://codereview.chromium.org/862283002 Cr-Commit-Position: refs/heads/master@{#312686} (cherry picked from commit a2752c14925409807eb4022ef79dfc736b4a883c) Review URL: https://codereview.chromium.org/915163002 Cr-Commit-Position: refs/branch-heads/2272@{#267} Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
-rw-r--r--chrome/browser/extensions/crx_installer.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index 70cc71e..a4207e7 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -299,6 +299,7 @@ CrxInstallerError CrxInstaller::AllowInstall(const Extension* extension) {
install_source_,
*expected_manifest_->value(),
creation_flags_,
+ extension->id(),
&error);
if (error.empty()) {
scoped_refptr<const PermissionSet> expected_permissions =